Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

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

@@ -10690,28 +10690,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            baseNatAppointmentDO.setDeptName("感染疾病科");
            baseNatAppointmentDO.setAmpm(pm);
            baseNatAppointmentDO= baseNatAppointmentDao.save(baseNatAppointmentDO);
            //添加订单
            BusinessOrderDO businessDO = new BusinessOrderDO();
            businessDO.setPatient(patientId);
            businessDO.setPatientName(name);
            businessDO.setOrderNo("HLWYY"+System.currentTimeMillis()+(int)(Math.random()*900)+100);
            businessDO.setCreateTime(new Date());
            businessDO.setStatus(0);
            businessDO.setRelationCode(baseNatAppointmentDO.getId()+"");
            businessDO.setRelationName("核酸检测订单");
            businessDO.setOrderCategory("6");
            businessDO.setOrderType(12);
            businessDO.setPayPrice(8000.0);
            businessDO.setRematk("核酸检测订单");
            businessDO.setDescription("核酸检测订单");
            businessDO.setPayType(1);
            businessDO.setUpdateTime(new Date());
            businessOrderDao.save(businessDO);
            //同步眼科医院
            logger.info("开始同步眼科医院");
            ykyyEntranceService.saveKsjc(baseNatAppointmentDO,demoFlag);
            logger.info("结束同步眼科医院");
            returnMap.put("msg","预约成功");
            returnMap.put("status","200");
            returnMap.put("id",baseNatAppointmentDO.getId());
@@ -10831,9 +10809,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (StringUtils.isNoneBlank(isSuccess)){
            sql+=" and t.is_success ="+isSuccess;
        }
        if (StringUtils.isNoneBlank(appointmentTime)){
            sql+=" and t.appointment_time >='"+appointmentTime+" 00:00:00'";
            sql+=" and t.appointment_time <='"+appointmentTime+" 23:59:59'";
            if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
                sql+=" and t.appointment_time >= to_date('" + appointmentTime + " 00:00:00', 'yyyy-mm-dd hh24:mi:ss')";
                sql+=" and t.appointment_time <= to_date('" + appointmentTime + " 23:59:59', 'yyyy-mm-dd hh24:mi:ss')";
            }else {
                sql+=" and t.appointment_time >='"+appointmentTime+" 00:00:00'";
                sql+=" and t.appointment_time <='"+appointmentTime+" 23:59:59'";
            }
        }
        sql+=" order by t.appointment_time desc ";
@@ -10884,11 +10869,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("1".equalsIgnoreCase(addressFlag)){
            sql+="select  t.province_name as \"provinceName\" from base_address_mapping t group by t.province_name ";
        }else if("2".equalsIgnoreCase(addressFlag)){
            sql+="select  t.city_name as \"cityName\" from base_address_mapping t where t.province_name ='"+parentName+"' and city_name <> '' and city_name is not null group by t.city_name ";
            sql+="select  t.city_name as \"cityName\" from base_address_mapping t where t.province_name ='"+parentName+"'  and city_name is not null group by t.city_name ";
        }else if("3".equalsIgnoreCase(addressFlag)){
            sql+="select  t.town_name as \"townName\" from base_address_mapping t  where t.city_name ='"+parentName+"' and town_name <> '' and town_name is not null group by t.town_name";
            sql+="select  t.town_name as \"townName\" from base_address_mapping t  where t.city_name ='"+parentName+"'  and town_name is not null group by t.town_name";
        }else if("4".equalsIgnoreCase(addressFlag)){
            sql+="select  t.street_name as \"streetName\" from base_address_mapping t  where t.town_name ='"+parentName+"' and street_name <> '' and street_name is not null";
            sql+="select  t.street_name as \"streetName\" from base_address_mapping t  where t.town_name ='"+parentName+"'  and street_name is not null";
        }
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        list.stream().forEach(one->{

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/YkMsYj01DO.java

@@ -6,7 +6,7 @@ import javax.persistence.*;
import java.util.Date;
/*
* 检查主表
 * 检查主表
 */
@Entity
@Table(name = "V_MS_YJ01")
@@ -21,19 +21,49 @@ public class YkMsYj01DO {
    private Integer ksdm;//医生科室
    private String ysdm;//VEMR_USER.ygdm 医生表中的员工代码
    private Integer zxks;//	执行科室VEMR_ORDER_ITEM zxks
    private String zxys;//执行医生
    private Integer zxpb;//执行判别 默认0
    private Integer zfpb;//	作废判别  0正常  1作废
    private Integer Cfbz;//	默认0
    private Integer jzxh;//	就诊序号HLWYS_MZ_JZLS的JZXH对应
    private Integer djzt;//默认0
    private Integer sqid;//去emr_jcsq里面sqdh
    private Integer qxbz;//取消标准  默认0
    private Integer sqid;//去emr_jcsq里面sqdh,申请ID
    private Integer qxbz;//取消标准  默认0 3、收费处取消  4、收费处取消后执行
    private String xmmc;//项目名称
    private Integer ztbh;//项目id  VEMR_ORDER_ITEM_MX
    private Integer ygsf;//默认0
    private Integer jcbw;//默认0
    private Integer zjflag;//默认1
    private Integer ljlx;//默认0
    private Integer zxkslx;
    private Integer zlxz;//默认0
    private String zfgh;
    private Integer zjflag;//默认0,传输标记
    private Integer ljlx;//路径类型
    private String tjhm;//特检号码
    private Date ZXRQ;//执行日期
    private String hjgh;//划价工号
    private String zysx;//注意事项
    private Integer yjgl;//医技关联
    private String hymx;//化验明细
    private String yjph;//医技片号
    private Integer sqwh;//申请文号
    private Integer fjgl;//附加处方；MS_CF02的SBXH
    private Integer fjlb;//附加类别；附加类别(2:药品用法,3:皮试)
    private Integer bwid;//部位编号
    private Integer jbid;//疾病编号
    private String jzkh;//就诊卡号
    private String xml;//申请单XML
    private String sqdmc;//申请单名称
    private String fyly;//费用来源
    private Integer tjfl;//特检分类
    private Date zfsj;//作废时间
    private Integer jmpb;
    private String ssys;//视光手术医生
    private String ssqsl;//手术前视力
    private String sshsl;//手术后视力
    private Integer ghgl;//挂号关联，关联ms_ghmx的sbxh
    private Integer hlwjf;//互联网医院缴费(1已缴费0未缴费)
    private Integer sjly;//数据来源(1互联网医院0眼科通)
    @Basic
    @Id
    @Column(name = "YJXH")
@@ -234,4 +264,294 @@ public class YkMsYj01DO {
    public void setLjlx(Integer ljlx) {
        this.ljlx = ljlx;
    }
    @Basic
    @Column(name = "ZXYS")
    public String getZxys() {
        return zxys;
    }
    public void setZxys(String zxys) {
        this.zxys = zxys;
    }
    @Basic
    @Column(name = "ZXKSLX")
    public Integer getZxkslx() {
        return zxkslx;
    }
    public void setZxkslx(Integer zxkslx) {
        this.zxkslx = zxkslx;
    }
    @Basic
    @Column(name = "ZLXZ")
    public Integer getZlxz() {
        return zlxz;
    }
    public void setZlxz(Integer zlxz) {
        this.zlxz = zlxz;
    }
    @Basic
    @Column(name = "ZFGH")
    public String getZfgh() {
        return zfgh;
    }
    public void setZfgh(String zfgh) {
        this.zfgh = zfgh;
    }
    @Basic
    @Column(name = "TJHM")
    public String getTjhm() {
        return tjhm;
    }
    public void setTjhm(String tjhm) {
        this.tjhm = tjhm;
    }
    @Basic
    @Column(name = "ZXRQ")
    public Date getZXRQ() {
        return ZXRQ;
    }
    public void setZXRQ(Date ZXRQ) {
        this.ZXRQ = ZXRQ;
    }
    @Basic
    @Column(name = "HJGH")
    public String getHjgh() {
        return hjgh;
    }
    public void setHjgh(String hjgh) {
        this.hjgh = hjgh;
    }
    @Basic
    @Column(name = "ZYSX")
    public String getZysx() {
        return zysx;
    }
    public void setZysx(String zysx) {
        this.zysx = zysx;
    }
    @Basic
    @Column(name = "YJGL")
    public Integer getYjgl() {
        return yjgl;
    }
    public void setYjgl(Integer yjgl) {
        this.yjgl = yjgl;
    }
    @Basic
    @Column(name = "HYMX")
    public String getHymx() {
        return hymx;
    }
    public void setHymx(String hymx) {
        this.hymx = hymx;
    }
    @Basic
    @Column(name = "YJPH")
    public String getYjph() {
        return yjph;
    }
    public void setYjph(String yjph) {
        this.yjph = yjph;
    }
    @Basic
    @Column(name = "SQWH")
    public Integer getSqwh() {
        return sqwh;
    }
    public void setSqwh(Integer sqwh) {
        this.sqwh = sqwh;
    }
    @Basic
    @Column(name = "FJGL")
    public Integer getFjgl() {
        return fjgl;
    }
    public void setFjgl(Integer fjgl) {
        this.fjgl = fjgl;
    }
    @Basic
    @Column(name = "FJLB")
    public Integer getFjlb() {
        return fjlb;
    }
    public void setFjlb(Integer fjlb) {
        this.fjlb = fjlb;
    }
    @Basic
    @Column(name = "BWID")
    public Integer getBwid() {
        return bwid;
    }
    public void setBwid(Integer bwid) {
        this.bwid = bwid;
    }
    @Basic
    @Column(name = "JBID")
    public Integer getJbid() {
        return jbid;
    }
    public void setJbid(Integer jbid) {
        this.jbid = jbid;
    }
    @Basic
    @Column(name = "JZKH")
    public String getJzkh() {
        return jzkh;
    }
    public void setJzkh(String jzkh) {
        this.jzkh = jzkh;
    }
    @Basic
    @Column(name = "XML")
    public String getXml() {
        return xml;
    }
    public void setXml(String xml) {
        this.xml = xml;
    }
    @Basic
    @Column(name = "SQDMC")
    public String getSqdmc() {
        return sqdmc;
    }
    public void setSqdmc(String sqdmc) {
        this.sqdmc = sqdmc;
    }
    @Basic
    @Column(name = "FYLY")
    public String getFyly() {
        return fyly;
    }
    public void setFyly(String fyly) {
        this.fyly = fyly;
    }
    @Basic
    @Column(name = "TJFL")
    public Integer getTjfl() {
        return tjfl;
    }
    public void setTjfl(Integer tjfl) {
        this.tjfl = tjfl;
    }
    @Basic
    @Column(name = "ZFSJ")
    public Date getZfsj() {
        return zfsj;
    }
    public void setZfsj(Date zfsj) {
        this.zfsj = zfsj;
    }
    @Basic
    @Column(name = "JMPB")
    public Integer getJmpb() {
        return jmpb;
    }
    public void setJmpb(Integer jmpb) {
        this.jmpb = jmpb;
    }
    @Basic
    @Column(name = "SSYS")
    public String getSsys() {
        return ssys;
    }
    public void setSsys(String ssys) {
        this.ssys = ssys;
    }
    @Basic
    @Column(name = "SSQSL")
    public String getSsqsl() {
        return ssqsl;
    }
    public void setSsqsl(String ssqsl) {
        this.ssqsl = ssqsl;
    }
    @Basic
    @Column(name = "SSHSL")
    public String getSshsl() {
        return sshsl;
    }
    public void setSshsl(String sshsl) {
        this.sshsl = sshsl;
    }
    @Basic
    @Column(name = "GHGL")
    public Integer getGhgl() {
        return ghgl;
    }
    public void setGhgl(Integer ghgl) {
        this.ghgl = ghgl;
    }
    @Basic
    @Column(name = "HLWJF")
    public Integer getHlwjf() {
        return hlwjf;
    }
    public void setHlwjf(Integer hlwjf) {
        this.hlwjf = hlwjf;
    }
    @Basic
    @Column(name = "SJLY")
    public Integer getSjly() {
        return sjly;
    }
    public void setSjly(Integer sjly) {
        this.sjly = sjly;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/YkMsYj02DO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.hospital.prescription;
import javax.persistence.*;
import javax.persistence.criteria.From;
import java.math.BigDecimal;
import java.util.Date;
/*
 * 检查明细
@@ -21,7 +22,11 @@ public class YkMsYj02DO {
    private Integer fygb;//SELECT fygb From GY_YLSF Where FYXH =l l_fyxh  查询后结果写入
    private Integer zfbl;//	默认1
    private Integer zxpb;//默认0
    private Integer zjflag;//	默认0
    private Integer zjflag;//	默认0 传输标记
    private String bzxx;
    private Integer tcylxh;
    private Integer czgh;
    private Date czrq;
    @Basic
    @Id
    @Column(name = "SBXH")
@@ -131,4 +136,44 @@ public class YkMsYj02DO {
    public void setZjflag(Integer zjflag) {
        this.zjflag = zjflag;
    }
    @Basic
    @Column(name = "BZXX")
    public String getBzxx() {
        return bzxx;
    }
    public void setBzxx(String bzxx) {
        this.bzxx = bzxx;
    }
    @Basic
    @Column(name = "TCYLXH")
    public Integer getTcylxh() {
        return tcylxh;
    }
    public void setTcylxh(Integer tcylxh) {
        this.tcylxh = tcylxh;
    }
    @Basic
    @Column(name = "CZGH")
    public Integer getCzgh() {
        return czgh;
    }
    public void setCzgh(Integer czgh) {
        this.czgh = czgh;
    }
    @Basic
    @Column(name = "CZRQ")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorOrderService.java

@@ -389,6 +389,7 @@ public class DoorOrderService {
        WlyyDoorServiceOrderDO doorServiceOrder = this.doorServiceOrderDao.findOne(orderId);
        if(StringUtils.isEmpty(doorServiceOrder.getFollowupDate())){
            doorServiceOrder.setFollowupDate(DateUtil.getStringDate());
            doorServiceOrder.setStatus(4);
            doorServiceOrderDao.save(doorServiceOrder);
        }
    }

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/followup/FollowUpService.java

@@ -178,6 +178,7 @@ public class FollowUpService {
        WlyyDoorServiceOrderDO orderDO = doorServiceOrderDao.findOne(relateCode);
        if(orderDO!=null){
            orderDO.setStatus(4);
            orderDO.setFollowupDate(DateUtil.getStringDate());
        }
    }