医生初始化信息追加、科室初始化信息追加

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -588,6 +588,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("1".equals(status)) {
            sql = "UPDATE base.wlyy_prescription p SET p.`status`='13' WHERE p.adm_no='" + admNo + "' AND p.real_order='" + realOrder + "' ";
        } else if ("2".equals(status)) {
            //开方成功时候，先用处方号获取本地处方状态是否为开方失败，如果是则需要更新本地的处方
            sql = "UPDATE base.wlyy_prescription p SET p.`status`='20' WHERE p.adm_no='" + admNo + "' AND p.real_order='" + realOrder + "' ";
            //变更门诊状态
            outPatientSql="UPDATE base.wlyy_outpatient p SET p.`status`='2' WHERE p.adm_no='" + admNo + "'";

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@@ -842,7 +842,11 @@ public class EntranceService {
                hdmDo.setCode(null==jsonObjectBody.get("Dept_Code")?"":jsonObjectBody.get("Dept_Code").toString());
                hdmDo.setName(null==jsonObjectBody.get("Dept_Name")?"":jsonObjectBody.get("Dept_Name").toString());
                hdmDo.setDeptTypeCode(deptTypeCode);
                hdmDo.setFatherDeptCode(null==jsonObjectBody.get("Father_Dept_Code")?"":jsonObjectBody.get("Father_Dept_Code").toString());
                hdmDo.setFatherDeptName(null==jsonObjectBody.get("Father_Dept_Name")?"":jsonObjectBody.get("Father_Dept_Name").toString());
                hdmDo.setCreateTime(new Date());
                hdmDo.setDeptType(null==jsonObjectBody.get("Dept_Type")?"":jsonObjectBody.get("Dept_Type").toString());
                hdmDo.setDeptPosition(null==jsonObjectBody.get("Dept_Position")?"":jsonObjectBody.get("Dept_Position").toString());
//                DictHospitalDeptDao.save(hdmDo);
                hospitalDeptMappingDOS.add(hdmDo);
            }
@@ -865,7 +869,6 @@ public class EntranceService {
            hdmDo.setOpenBedNum(null==jsonObjectBody.get("Open_Bed_Num")?"":jsonObjectBody.get("Open_Bed_Num").toString());
            hdmDo.setFatherDeptCode(null==jsonObjectBody.get("Father_Dept_Code")?"":jsonObjectBody.get("Father_Dept_Code").toString());
            hdmDo.setFatherDeptName(null==jsonObjectBody.get("Father_Dept_Name")?"":jsonObjectBody.get("Father_Dept_Name").toString());
            hdmDo.setDeptPosition(null==jsonObjectBody.get("Dept_Position")?"":jsonObjectBody.get("Dept_Position").toString());
            hdmDo.setDeptRemark(null==jsonObjectBody.get("Dept_Remark")?"":jsonObjectBody.get("Dept_Remark").toString());
            hdmDo.setDeptAgeLimit(null==jsonObjectBody.get("Dept_Age_Limit")?"":jsonObjectBody.get("Dept_Age_Limit").toString());
            hdmDo.setDeptTelNum(null==jsonObjectBody.get("Dept_Tel_Num")?"":jsonObjectBody.get("Dept_Tel_Num").toString());
@@ -1455,6 +1458,8 @@ public class EntranceService {
                                baseDoctorDO.setIdcard(idCard);
                                baseDoctorDO.setBirthday(IdCardUtil.getBirthdayForIdcard(idCard));
                                baseDoctorDO.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard(idCard)));
                                baseDoctorDO.setLocked(0);
                                baseDoctorDO.setEnabled(1);
                                //拼音码
                                baseDoctorDO.setSpell(null == jsonObjectBody.get("PinYin_Code") ? "" : jsonObjectBody.get("PinYin_Code").toString());
                                String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictHospitalDeptDO.java

@@ -46,6 +46,24 @@ public class DictHospitalDeptDO extends IntegerIdentityEntity {
     */
    private String deptTypeCode;
    /**
     * 父类科室编码
     */
    private String fatherDeptCode;
    /**
     * 父类科室名称
     */
    private String fatherDeptName;
    /**
     * 科室类型
     */
    private String deptType;
    /**
     * 科室位置
     */
    private String deptPosition;
	@Column(name = "org_code")
    public String getOrgCode() {
@@ -87,4 +105,36 @@ public class DictHospitalDeptDO extends IntegerIdentityEntity {
    public void setDeptTypeCode(String deptTypeCode) {
        this.deptTypeCode = deptTypeCode;
    }
    public String getFatherDeptCode() {
        return fatherDeptCode;
    }
    public void setFatherDeptCode(String fatherDeptCode) {
        this.fatherDeptCode = fatherDeptCode;
    }
    public String getFatherDeptName() {
        return fatherDeptName;
    }
    public void setFatherDeptName(String fatherDeptName) {
        this.fatherDeptName = fatherDeptName;
    }
    public String getDeptType() {
        return deptType;
    }
    public void setDeptType(String deptType) {
        this.deptType = deptType;
    }
    public String getDeptPosition() {
        return deptPosition;
    }
    public void setDeptPosition(String deptPosition) {
        this.deptPosition = deptPosition;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorDO.java

@@ -170,6 +170,14 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
	 * 作废标识，1正常，0作废
	 */
	private String del;
    /**
     * 是否锁定：0可用；1锁定
     */
	private Integer locked;
    /**
     * 账号是否可用，1为可用；0为不可用
     */
	private Integer enabled;
	@Column(name = "password")
    public String getPassword() {
@@ -411,4 +419,20 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    public void setChargeType(String chargeType) {
        this.chargeType = chargeType;
    }
    public Integer getLocked() {
        return locked;
    }
    public void setLocked(Integer locked) {
        this.locked = locked;
    }
    public Integer getEnabled() {
        return enabled;
    }
    public void setEnabled(Integer enabled) {
        this.enabled = enabled;
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/event/ApplicationEvent.java

@@ -1,6 +1,6 @@
package com.yihu.jw.event;
import com.yihu.jw.job.ChannelUpdateJob;
import com.yihu.jw.job.PrescriptionStatusUpdateJob;
import com.yihu.jw.job.QuartzHelper;
import com.yihu.jw.util.SystemConf;
import org.slf4j.Logger;
@@ -26,13 +26,13 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
    public void onApplicationEvent(ContextRefreshedEvent ContextRefreshedEvent) {
        try {
            //健康频道状态更新job
            if (!quartzHelper.isExistJob("channel_update_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("channel_update_job");
                quartzHelper.addJob(ChannelUpdateJob.class, trigger, "channel_update_job", new HashMap<String, Object>());
                logger.info("channel_update_job  job success");
            //互联网医院处方状态更新job
            if (!quartzHelper.isExistJob("prescriptionStatus_update_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("prescriptionStatus_update_job");
                quartzHelper.addJob(PrescriptionStatusUpdateJob.class, trigger, "prescriptionStatus_update_job", new HashMap<String, Object>());
                logger.info("prescriptionStatus_update_job  job success");
            } else {
                logger.info("channel_update_job  job exist");
                logger.info("prescriptionStatus_update_job  job exist");
            }
        } catch (Exception e) {

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/ChannelUpdateJob.java

@@ -1,6 +1,6 @@
package com.yihu.jw.job;
import com.yihu.jw.service.channel.ChannelUpdateService;
import com.yihu.jw.service.channel.PrescriptionStatusUpdateService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -9,22 +9,22 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * 健康频道状态更新job
 * 处方状态更新job
 * Created by zdm on 2019/2/20.
 */
public class ChannelUpdateJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(ChannelUpdateJob.class);
public class PrescriptionStatusUpdateJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(PrescriptionStatusUpdateJob.class);
    @Autowired
    private ChannelUpdateService channelUpdateService;
    private PrescriptionStatusUpdateService prescriptionStatusUpdateService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========ChannelUpdateJob========");
        logger.info("START========PrescriptionStatusUpdateJob========");
        try {
            channelUpdateService.autoPush();
            logger.info("END========ChannelUpdateJob========");
            prescriptionStatusUpdateService.autoPush();
            logger.info("END========PrescriptionStatusUpdateJob========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.info("END===ERROE===ChannelUpdateJob,message:"+e.getMessage());
            logger.error("END===ERROE===PrescriptionStatusUpdateJob,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/ChannelUpdateService.java

@@ -1,8 +1,6 @@
package com.yihu.jw.service.channel;
import com.yihu.jw.util.DateUtil;
import com.yihu.jw.web.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,23 +8,25 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * 健康频道状态变更
 * 处方状态变更
 */
@Component
@Transactional
public class ChannelUpdateService {
    private static Logger logger = LoggerFactory.getLogger(ChannelUpdateService.class);
public class PrescriptionStatusUpdateService {
    private static Logger logger = LoggerFactory.getLogger(PrescriptionStatusUpdateService.class);
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public void autoPush() throws Exception{
        logger.info("job执行中++++++++++++++++++++++++");
        //获取所有未结束处方
        String sql = "SELECT a.id ,a.start_time,a.end_time FROM wlyy.wlyy_channel_recommend_article a WHERE a.del_flag>0 AND a.type=2";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//        //获取当前时间
//        String dateString = format.format(new Date());

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

@@ -1,6 +1,6 @@
package com.yihu.jw.web.quota;
import com.yihu.jw.job.ChannelUpdateJob;
import com.yihu.jw.job.PrescriptionStatusUpdateJob;
import com.yihu.jw.job.QuartzHelper;
import com.yihu.jw.service.quota.JobService;
@@ -186,11 +186,11 @@ public class JobController extends BaseController {
        }
    }
    @RequestMapping(value = "/channelUpdateJob", method = RequestMethod.POST)
    @ApiOperation("健康频道状态变更")
    public String channelUpdateJob() {
    @RequestMapping(value = "/PrescriptionStatusUpdateJob", method = RequestMethod.POST)
    @ApiOperation("处方状态变更")
    public String PrescriptionStatusUpdateJob() {
        try {
            quartzHelper.startNow(ChannelUpdateJob.class, UUID.randomUUID().toString(), null);
            quartzHelper.startNow(PrescriptionStatusUpdateJob.class, UUID.randomUUID().toString(), null);
            return write(200, "启动成功");
        } catch (Exception e) {
            error(e);