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/entrance/XzzxEntranceService.java

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -83,7 +83,7 @@ public class BusinessOrderService {
        String patient = businessOrderDO.getPatient();
        BasePatientDO basePatientDO = patientDao.findById(patient);
        String orderNo = businessOrderDO.getOrderNo();
        String patientId = basePatientDO.getUserId();
        String patientId = basePatientDO.getYktId();
        String orderAmout = businessOrderDO.getPayPrice().toString();
        String description = businessOrderDO.getDescription();
        String state = businessOrderDO.getStatus().toString();
@@ -124,7 +124,7 @@ public class BusinessOrderService {
        String patient = businessOrderDO.getPatient();
        BasePatientDO basePatientDO = patientDao.findById(patient);
        String orderNo = businessOrderDO.getOrderNo();
        String patientId = basePatientDO.getUserId();
        String patientId = basePatientDO.getYktId();
        String orderAmout = businessOrderDO.getPayPrice().toString();
        String description = businessOrderDO.getDescription();
        String state = businessOrderDO.getStatus().toString();
@@ -457,7 +457,7 @@ public class BusinessOrderService {
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(orderNo);
        String patient = businessOrderDO.getPatient();
        BasePatientDO basePatientDO = patientDao.findById(patient);
        String patientId = basePatientDO.getUserId();
        String patientId = basePatientDO.getYktId();
        String orderAmout = businessOrderDO.getPayPrice().toString();
        String description = businessOrderDO.getDescription();
        String state = businessOrderDO.getStatus().toString();

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

@@ -14,548 +14,548 @@ import java.util.Date;
@Entity
@Table(name = "HLW_CF01",  catalog = "model")
public class HlwCf01DO {
    private Integer CFSB;//	NUMBER(18)	N			处方识别
    private String CFHM;//	VARCHAR2(10)	Y			处方号码
    private String FPHM;//	VARCHAR2(12)	Y			发票号码
    private Integer MZXH;//	NUMBER(18)	Y			门诊序号
    private Integer CFLX;//	NUMBER(1)	N			处方类型
    private Integer BRID;//	NUMBER(18)	Y			病人ID号
    private String BRXM;//	VARCHAR2(40)	Y			病人姓名
    private Date KFRQ;//	DATE	        N			开方日期
    private Integer CFTS;//	NUMBER(2)	N			处方贴数
    private Integer KSDM;//	NUMBER(4)	Y			科室代码
    private String YSDM;//	VARCHAR2(10)	Y			医生代码
    private Date FYRQ;//	DATE	        Y			发药日期
    private Integer FYCK;//	NUMBER(2)	Y			发药窗口
    private String HJGH;//	VARCHAR2(10)	Y			划价工号
    private String PYGH;//	VARCHAR2(10)	Y			配药工号
    private String FYGH;//	VARCHAR2(10)	Y			发药工号
    private Integer PYBZ;//	NUMBER(1)	N			配药标志
    private Integer FYBZ;//	NUMBER(1)	N			发药标志
    private Integer CFGL;//	NUMBER(18)	Y			处方关联
    private Integer ZFPB;//	NUMBER(1)	N			作废判别
    private Integer DYBZ;//	NUMBER(1)	Y			打印标志
    private Integer YFSB;//	NUMBER(3)	N			药房识别
    private Integer TSCF;//	NUMBER(2)	Y			特殊处方
    private Integer TSLX;//	INTEGER	Y			特殊类型
    private Integer TYBZ;//	NUMBER(1)	Y			退药标志
    private Integer CFBZ;//	NUMBER(1)	Y			处方标志(CFBZ = 2 处方锁定)
    private Integer JZXH;//	NUMBER(18)	Y			门诊就诊
    private Integer YXPB;//	NUMBER(1)	N			优先处方
    private String JZKH;//	VARCHAR2(20)	Y			就诊卡号
    private Integer DJYBZ;//	NUMBER(1)	N			代煎药标志
    private Date ZFSJ;//	DATE	        Y			作废时间
    private String HDGH;//	VARCHAR2(10)	Y			核对工号
    private Date HDRQ;//	DATE	        Y			核对日期
    private Integer JMPB;//	NUMBER  	Y
    private Integer YJYY;//	NUMBER(2)	Y
    private String TSBZDM;//	VARCHAR2(20)	Y
    private Integer LSCFBZ;//	NUMBER(1)	Y			零散处方标志：1是、0否
    private String TYGH;//	VARCHAR2(10)	Y
    private Integer ZJFLAG;//	NUMBER(1)	Y
    private Integer ZLXZ;//	NUMBER(5)	Y
    private String ZFGH;//	VARCHAR2(10)	Y
    private String BZ;//    VARCHAR2(100)	Y
    private String SCDDH;//	VARCHAR2(50)	N			商城订单号
    private Integer SPZT;//	NUMBER(1)	Y	0		审批状态   0未审批   1通过  2不通过
    private Integer DQPB;//	NUMBER(1)	Y	0		读取判别   0未读取   1已读取
    private Date SPRQ;//	DATE	        Y			         审批通过时间
    private Integer FKZT;//	NUMBER(1)	Y	0		0 未付款  1付款
    private String SPGH;//	VARCHAR2(10)	Y			审批工号
    private String GUID;//
    private Integer cFSB;//	NUMBER(18)	N			处方识别
    private String cFHM;//	VARCHAR2(10)	Y			处方号码
    private String fPHM;//	VARCHAR2(12)	Y			发票号码
    private Integer mZXH;//	NUMBER(18)	Y			门诊序号
    private Integer cFLX;//	NUMBER(1)	N			处方类型
    private Integer bRID;//	NUMBER(18)	Y			病人ID号
    private String bRXM;//	VARCHAR2(40)	Y			病人姓名
    private Date kFRQ;//	DATE	        N			开方日期
    private Integer cFTS;//	NUMBER(2)	N			处方贴数
    private Integer kSDM;//	NUMBER(4)	Y			科室代码
    private String ySDM;//	VARCHAR2(10)	Y			医生代码
    private Date fYRQ;//	DATE	        Y			发药日期
    private Integer fYCK;//	NUMBER(2)	Y			发药窗口
    private String hJGH;//	VARCHAR2(10)	Y			划价工号
    private String pYGH;//	VARCHAR2(10)	Y			配药工号
    private String fYGH;//	VARCHAR2(10)	Y			发药工号
    private Integer pYBZ;//	NUMBER(1)	N			配药标志
    private Integer fYBZ;//	NUMBER(1)	N			发药标志
    private Integer cFGL;//	NUMBER(18)	Y			处方关联
    private Integer zFPB;//	NUMBER(1)	N			作废判别
    private Integer dYBZ;//	NUMBER(1)	Y			打印标志
    private Integer yFSB;//	NUMBER(3)	N			药房识别
    private Integer tSCF;//	NUMBER(2)	Y			特殊处方
    private Integer tSLX;//	INTEGER	Y			特殊类型
    private Integer tYBZ;//	NUMBER(1)	Y			退药标志
    private Integer cFBZ;//	NUMBER(1)	Y			处方标志(CFBZ = 2 处方锁定)
    private Integer jZXH;//	NUMBER(18)	Y			门诊就诊
    private Integer yXPB;//	NUMBER(1)	N			优先处方
    private String jZKH;//	VARCHAR2(20)	Y			就诊卡号
    private Integer dJYBZ;//	NUMBER(1)	N			代煎药标志
    private Date zFSJ;//	DATE	        Y			作废时间
    private String hDGH;//	VARCHAR2(10)	Y			核对工号
    private Date hDRQ;//	DATE	        Y			核对日期
    private Integer jMPB;//	NUMBER  	Y
    private Integer yJYY;//	NUMBER(2)	Y
    private String tSBZDM;//	VARCHAR2(20)	Y
    private Integer lSCFBZ;//	NUMBER(1)	Y			零散处方标志：1是、0否
    private String tYGH;//	VARCHAR2(10)	Y
    private Integer zJFLAG;//	NUMBER(1)	Y
    private Integer zLXZ;//	NUMBER(5)	Y
    private String zFGH;//	VARCHAR2(10)	Y
    private String bZ;//    VARCHAR2(100)	Y
    private String sCDDH;//	VARCHAR2(50)	N			商城订单号
    private Integer sPZT;//	NUMBER(1)	Y	0		审批状态   0未审批   1通过  2不通过
    private Integer dQPB;//	NUMBER(1)	Y	0		读取判别   0未读取   1已读取
    private Date sPRQ;//	DATE	        Y			         审批通过时间
    private Integer fKZT;//	NUMBER(1)	Y	0		0 未付款  1付款
    private String sPGH;//	VARCHAR2(10)	Y			审批工号
    private String gUID;//
    @Basic
    @Id
    @Column(name = "CFSB")
    public Integer getCFSB() {
        return CFSB;
        return cFSB;
    }
    public void setCFSB(Integer CFSB) {
        this.CFSB = CFSB;
    public void setCFSB(Integer cFSB) {
        this.cFSB = cFSB;
    }
    @Basic
    @Column(name = "CFHM")
    public String getCFHM() {
        return CFHM;
        return cFHM;
    }
    public void setCFHM(String CFHM) {
        this.CFHM = CFHM;
    public void setCFHM(String cFHM) {
        this.cFHM = cFHM;
    }
    @Basic
    @Column(name = "FPHM")
    public String getFPHM() {
        return FPHM;
        return fPHM;
    }
    public void setFPHM(String FPHM) {
        this.FPHM = FPHM;
    public void setFPHM(String fPHM) {
        this.fPHM = fPHM;
    }
    @Basic
    @Column(name = "MZXH")
    public Integer getMZXH() {
        return MZXH;
        return mZXH;
    }
    public void setMZXH(Integer MZXH) {
        this.MZXH = MZXH;
    public void setMZXH(Integer mZXH) {
        this.mZXH = mZXH;
    }
    @Basic
    @Column(name = "CFLX")
    public Integer getCFLX() {
        return CFLX;
        return cFLX;
    }
    public void setCFLX(Integer CFLX) {
        this.CFLX = CFLX;
    public void setCFLX(Integer cFLX) {
        this.cFLX = cFLX;
    }
    @Basic
    @Column(name = "BRID")
    public Integer getBRID() {
        return BRID;
        return bRID;
    }
    public void setBRID(Integer BRID) {
        this.BRID = BRID;
    public void setBRID(Integer bRID) {
        this.bRID = bRID;
    }
    @Basic
    @Column(name = "BRXM")
    public String getBRXM() {
        return BRXM;
        return bRXM;
    }
    public void setBRXM(String BRXM) {
        this.BRXM = BRXM;
    public void setBRXM(String bRXM) {
        this.bRXM = bRXM;
    }
    @Basic
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "KFRQ")
    public Date getKFRQ() {
        return KFRQ;
        return kFRQ;
    }
    public void setKFRQ(Date KFRQ) {
        this.KFRQ = KFRQ;
    public void setKFRQ(Date kFRQ) {
        this.kFRQ = kFRQ;
    }
    @Basic
    @Column(name = "CFTS")
    public Integer getCFTS() {
        return CFTS;
        return cFTS;
    }
    public void setCFTS(Integer CFTS) {
        this.CFTS = CFTS;
    public void setCFTS(Integer cFTS) {
        this.cFTS = cFTS;
    }
    @Basic
    @Column(name = "KSDM")
    public Integer getKSDM() {
        return KSDM;
        return kSDM;
    }
    public void setKSDM(Integer KSDM) {
        this.KSDM = KSDM;
    public void setKSDM(Integer kSDM) {
        this.kSDM = kSDM;
    }
    @Basic
    @Column(name = "YSDM")
    public String getYSDM() {
        return YSDM;
        return ySDM;
    }
    public void setYSDM(String YSDM) {
        this.YSDM = YSDM;
    public void setYSDM(String ySDM) {
        this.ySDM = ySDM;
    }
    @Basic
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "FYRQ")
    public Date getFYRQ() {
        return FYRQ;
        return fYRQ;
    }
    public void setFYRQ(Date FYRQ) {
        this.FYRQ = FYRQ;
    public void setFYRQ(Date fYRQ) {
        this.fYRQ = fYRQ;
    }
    @Basic
    @Column(name = "FYCK")
    public Integer getFYCK() {
        return FYCK;
        return fYCK;
    }
    public void setFYCK(Integer FYCK) {
        this.FYCK = FYCK;
    public void setFYCK(Integer fYCK) {
        this.fYCK = fYCK;
    }
    @Basic
    @Column(name = "HJGH")
    public String getHJGH() {
        return HJGH;
        return hJGH;
    }
    public void setHJGH(String HJGH) {
        this.HJGH = HJGH;
    public void setHJGH(String hJGH) {
        this.hJGH = hJGH;
    }
    @Basic
    @Column(name = "PYGH")
    public String getPYGH() {
        return PYGH;
        return pYGH;
    }
    public void setPYGH(String PYGH) {
        this.PYGH = PYGH;
    public void setPYGH(String pYGH) {
        this.pYGH = pYGH;
    }
    @Basic
    @Column(name = "FYGH")
    public String getFYGH() {
        return FYGH;
        return fYGH;
    }
    public void setFYGH(String FYGH) {
        this.FYGH = FYGH;
    public void setFYGH(String fYGH) {
        this.fYGH = fYGH;
    }
    @Basic
    @Column(name = "PYBZ")
    public Integer getPYBZ() {
        return PYBZ;
        return pYBZ;
    }
    public void setPYBZ(Integer PYBZ) {
        this.PYBZ = PYBZ;
    public void setPYBZ(Integer pYBZ) {
        this.pYBZ = pYBZ;
    }
    @Basic
    @Column(name = "FYBZ")
    public Integer getFYBZ() {
        return FYBZ;
        return fYBZ;
    }
    public void setFYBZ(Integer FYBZ) {
        this.FYBZ = FYBZ;
    public void setFYBZ(Integer fYBZ) {
        this.fYBZ = fYBZ;
    }
    @Basic
    @Column(name = "CFGL")
    public Integer getCFGL() {
        return CFGL;
        return cFGL;
    }
    public void setCFGL(Integer CFGL) {
        this.CFGL = CFGL;
    public void setCFGL(Integer cFGL) {
        this.cFGL = cFGL;
    }
    @Basic
    @Column(name = "ZFPB")
    public Integer getZFPB() {
        return ZFPB;
        return zFPB;
    }
    public void setZFPB(Integer ZFPB) {
        this.ZFPB = ZFPB;
    public void setZFPB(Integer zFPB) {
        this.zFPB = zFPB;
    }
    @Basic
    @Column(name = "DYBZ")
    public Integer getDYBZ() {
        return DYBZ;
        return dYBZ;
    }
    public void setDYBZ(Integer DYBZ) {
        this.DYBZ = DYBZ;
    public void setDYBZ(Integer dYBZ) {
        this.dYBZ = dYBZ;
    }
    @Basic
    @Column(name = "YFSB")
    public Integer getYFSB() {
        return YFSB;
        return yFSB;
    }
    public void setYFSB(Integer YFSB) {
        this.YFSB = YFSB;
    public void setYFSB(Integer yFSB) {
        this.yFSB = yFSB;
    }
    @Basic
    @Column(name = "TSCF")
    public Integer getTSCF() {
        return TSCF;
        return tSCF;
    }
    public void setTSCF(Integer TSCF) {
        this.TSCF = TSCF;
    public void setTSCF(Integer tSCF) {
        this.tSCF = tSCF;
    }
    @Basic
    @Column(name = "TSLX")
    public Integer getTSLX() {
        return TSLX;
        return tSLX;
    }
    public void setTSLX(Integer TSLX) {
        this.TSLX = TSLX;
    public void setTSLX(Integer tSLX) {
        this.tSLX = tSLX;
    }
    @Basic
    @Column(name = "TYBZ")
    public Integer getTYBZ() {
        return TYBZ;
        return tYBZ;
    }
    public void setTYBZ(Integer TYBZ) {
        this.TYBZ = TYBZ;
    public void setTYBZ(Integer tYBZ) {
        this.tYBZ = tYBZ;
    }
    @Basic
    @Column(name = "CFBZ")
    public Integer getCFBZ() {
        return CFBZ;
        return cFBZ;
    }
    public void setCFBZ(Integer CFBZ) {
        this.CFBZ = CFBZ;
    public void setCFBZ(Integer cFBZ) {
        this.cFBZ = cFBZ;
    }
    @Basic
    @Column(name = "JZXH")
    public Integer getJZXH() {
        return JZXH;
        return jZXH;
    }
    public void setJZXH(Integer JZXH) {
        this.JZXH = JZXH;
    public void setJZXH(Integer jZXH) {
        this.jZXH = jZXH;
    }
    @Basic
    @Column(name = "YXPB")
    public Integer getYXPB() {
        return YXPB;
        return yXPB;
    }
    public void setYXPB(Integer YXPB) {
        this.YXPB = YXPB;
    public void setYXPB(Integer yXPB) {
        this.yXPB = yXPB;
    }
    @Basic
    @Column(name = "JZKH")
    public String getJZKH() {
        return JZKH;
        return jZKH;
    }
    public void setJZKH(String JZKH) {
        this.JZKH = JZKH;
    public void setJZKH(String jZKH) {
        this.jZKH = jZKH;
    }
    @Basic
    @Column(name = "DJYBZ")
    public Integer getDJYBZ() {
        return DJYBZ;
        return dJYBZ;
    }
    public void setDJYBZ(Integer DJYBZ) {
        this.DJYBZ = DJYBZ;
    public void setDJYBZ(Integer dJYBZ) {
        this.dJYBZ = dJYBZ;
    }
    @Basic
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "ZFSJ")
    public Date getZFSJ() {
        return ZFSJ;
        return zFSJ;
    }
    public void setZFSJ(Date ZFSJ) {
        this.ZFSJ = ZFSJ;
    public void setZFSJ(Date zFSJ) {
        this.zFSJ = zFSJ;
    }
    @Basic
    @Column(name = "HDGH")
    public String getHDGH() {
        return HDGH;
        return hDGH;
    }
    public void setHDGH(String HDGH) {
        this.HDGH = HDGH;
    public void setHDGH(String hDGH) {
        this.hDGH = hDGH;
    }
    @Basic
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "HDRQ")
    public Date getHDRQ() {
        return HDRQ;
        return hDRQ;
    }
    public void setHDRQ(Date HDRQ) {
        this.HDRQ = HDRQ;
    public void setHDRQ(Date hDRQ) {
        this.hDRQ = hDRQ;
    }
    @Basic
    @Column(name = "JMPB")
    public Integer getJMPB() {
        return JMPB;
        return jMPB;
    }
    public void setJMPB(Integer JMPB) {
        this.JMPB = JMPB;
    public void setJMPB(Integer jMPB) {
        this.jMPB = jMPB;
    }
    @Basic
    @Column(name = "YJYY")
    public Integer getYJYY() {
        return YJYY;
        return yJYY;
    }
    public void setYJYY(Integer YJYY) {
        this.YJYY = YJYY;
    public void setYJYY(Integer yJYY) {
        this.yJYY = yJYY;
    }
    @Basic
    @Column(name = "TSBZDM")
    public String getTSBZDM() {
        return TSBZDM;
        return tSBZDM;
    }
    public void setTSBZDM(String TSBZDM) {
        this.TSBZDM = TSBZDM;
    public void setTSBZDM(String tSBZDM) {
        this.tSBZDM = tSBZDM;
    }
    @Basic
    @Column(name = "LSCFBZ")
    public Integer getLSCFBZ() {
        return LSCFBZ;
        return lSCFBZ;
    }
    public void setLSCFBZ(Integer LSCFBZ) {
        this.LSCFBZ = LSCFBZ;
    public void setLSCFBZ(Integer lSCFBZ) {
        this.lSCFBZ = lSCFBZ;
    }
    @Basic
    @Column(name = "TYGH")
    public String getTYGH() {
        return TYGH;
        return tYGH;
    }
    public void setTYGH(String TYGH) {
        this.TYGH = TYGH;
    public void setTYGH(String tYGH) {
        this.tYGH = tYGH;
    }
    @Basic
    @Column(name = "ZJFLAG")
    public Integer getZJFLAG() {
        return ZJFLAG;
        return zJFLAG;
    }
    public void setZJFLAG(Integer ZJFLAG) {
        this.ZJFLAG = ZJFLAG;
    public void setZJFLAG(Integer zJFLAG) {
        this.zJFLAG = zJFLAG;
    }
    @Basic
    @Column(name = "ZLXZ")
    public Integer getZLXZ() {
        return ZLXZ;
        return zLXZ;
    }
    public void setZLXZ(Integer ZLXZ) {
        this.ZLXZ = ZLXZ;
    public void setZLXZ(Integer zLXZ) {
        this.zLXZ = zLXZ;
    }
    @Basic
    @Column(name = "ZFGH")
    public String getZFGH() {
        return ZFGH;
        return zFGH;
    }
    public void setZFGH(String ZFGH) {
        this.ZFGH = ZFGH;
    public void setZFGH(String zFGH) {
        this.zFGH = zFGH;
    }
    @Basic
    @Column(name = "BZ")
    public String getBZ() {
        return BZ;
        return bZ;
    }
    public void setBZ(String BZ) {
        this.BZ = BZ;
    public void setBZ(String bZ) {
        this.bZ = bZ;
    }
    @Basic
    @Column(name = "SCDDH")
    public String getSCDDH() {
        return SCDDH;
        return sCDDH;
    }
    public void setSCDDH(String SCDDH) {
        this.SCDDH = SCDDH;
    public void setSCDDH(String sCDDH) {
        this.sCDDH = sCDDH;
    }
    @Basic
    @Column(name = "SPZT")
    public Integer getSPZT() {
        return SPZT;
        return sPZT;
    }
    public void setSPZT(Integer SPZT) {
        this.SPZT = SPZT;
    public void setSPZT(Integer sPZT) {
        this.sPZT = sPZT;
    }
    @Basic
    @Column(name = "DQPB")
    public Integer getDQPB() {
        return DQPB;
        return dQPB;
    }
    public void setDQPB(Integer DQPB) {
        this.DQPB = DQPB;
    public void setDQPB(Integer dQPB) {
        this.dQPB = dQPB;
    }
    @Basic
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "SPRQ")
    public Date getSPRQ() {
        return SPRQ;
        return sPRQ;
    }
    public void setSPRQ(Date SPRQ) {
        this.SPRQ = SPRQ;
    public void setSPRQ(Date sPRQ) {
        this.sPRQ = sPRQ;
    }
    @Basic
    @Column(name = "FKZT")
    public Integer getFKZT() {
        return FKZT;
        return fKZT;
    }
    public void setFKZT(Integer FKZT) {
        this.FKZT = FKZT;
    public void setFKZT(Integer fKZT) {
        this.fKZT = fKZT;
    }
    @Basic
    @Column(name = "SPGH")
    public String getSPGH() {
        return SPGH;
        return sPGH;
    }
    public void setSPGH(String SPGH) {
        this.SPGH = SPGH;
    public void setSPGH(String sPGH) {
        this.sPGH = sPGH;
    }
    @Basic
    @Column(name = "GUID")
    public String getGUID() {
        return GUID;
        return gUID;
    }
    public void setGUID(String GUID) {
        this.GUID = GUID;
    public void setGUID(String gUID) {
        this.gUID = gUID;
    }
}

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

@@ -12,482 +12,482 @@ import java.util.Date;
@Entity
@Table(name = "HLW_CF02", catalog = "model")
public class HlwCf02DO {
    private Integer SBXH;//NUMBER(18)   N注释
    private Integer CFSB;//NUMBER(18)   N识别序号
    private Integer YPXH;//NUMBER(6)    N处方识别
    private Integer YPCD;//NUMBER(6)    N药品序号
    private Integer XMLX;//NUMBER(2)    N药品产地
    private Integer CFTS;//NUMBER(2)    N项目类型
    private Integer YPSL;//NUMBER(10,2) N处方贴数
    private Integer YPDJ;//NUMBER(12,4) N药品数量
    private Integer HJJE;//NUMBER(12,2) N药品单价
    private Integer YPZS;//INTEGER      N划价金额
    private String YCSL;//VARCHAR2(20)  N药品组数
    private Integer FYGB;//NUMBER(4)    N一次数量
    private Integer ZFBL;//NUMBER(5,3)  N费用归并
    private Integer GYTJ;//NUMBER(4)    Y自负比例
    private String YPYF;//VARCHAR2(20)  Y给药途径
    private Integer YPZH;//NUMBER(18)   Y药品用法
    private String YFGG;//VARCHAR2(20)  Y药品组号
    private String YFDW;//VARCHAR2(4)   Y药房规格
    private Integer YFBZ;//NUMBER(4)    N药房单位
    private String SJYL;//VARCHAR2(20)  Y药房包装
    private Integer PSPB;//NUMBER(1)    Y实际用量
    private Integer YYTS;//INTEGER      Y皮试判别
    private Integer YCSL2;//NUMBER(10,4)Y用药天数
    private Integer XSSL;//NUMBER(10,4) Y一次用量
    private Integer MRCS;//NUMBER(2)    N显示数量
    private String CFBZ;//VARCHAR2(40)  Y每日次数
    private Integer YCJL;//NUMBER(10,2) Y处方标志
    private Integer PSJG;//NUMBER(1)    Y一次剂量
    private Integer PLXH;//NUMBER(4)    Y皮试结果
    private Integer SYBZ;//NUMBER(1)    Y排列序号
    private Integer ZBBZ;//NUMBER(1)    Y输液标志；1 输液调入   0 或 NULL 未调入
    private Integer YDFYBZ;//NUMBER(1)  Y药店发药标志
    private Integer TYSQSL;//NUMBER(5)  Y退药申请数量
    private Date YDFYRQ;//DATE          Y药店发药人
    private String YDFYR;//VARCHAR2(20) Y药店发药日期
    private Integer CZGH;//NUMBER(8)    Y操作工号
    private Date CZRQ;//DATE            Y操作日期
    private Integer ZJFLAG;//NUMBER(1)  Y
    private Integer MBYF;//NUMBER(1)    Y
    private String BZ;//VARCHAR2(200)   Y备注
    private Integer JHJG;//NUMBER(12,4) Y进货价格
    private Integer SPZT;//NUMBER(1)    Y0审批状态        0表示未审批   1表示审批通过   2表示审批未通过
    private String THYY;//VARCHAR2(200) Y退回原因
    private Integer sBXH;//NUMBER(18)   N注释
    private Integer cFSB;//NUMBER(18)   N识别序号
    private Integer yPXH;//NUMBER(6)    N处方识别
    private Integer yPCD;//NUMBER(6)    N药品序号
    private Integer xMLX;//NUMBER(2)    N药品产地
    private Integer cFTS;//NUMBER(2)    N项目类型
    private Integer yPSL;//NUMBER(10,2) N处方贴数
    private Integer yPDJ;//NUMBER(12,4) N药品数量
    private Integer hJJE;//NUMBER(12,2) N药品单价
    private Integer yPZS;//INTEGER      N划价金额
    private String yCSL;//VARCHAR2(20)  N药品组数
    private Integer fYGB;//NUMBER(4)    N一次数量
    private Integer zFBL;//NUMBER(5,3)  N费用归并
    private Integer gYTJ;//NUMBER(4)    Y自负比例
    private String yPYF;//VARCHAR2(20)  Y给药途径
    private Integer yPZH;//NUMBER(18)   Y药品用法
    private String yFGG;//VARCHAR2(20)  Y药品组号
    private String yFDW;//VARCHAR2(4)   Y药房规格
    private Integer yFBZ;//NUMBER(4)    N药房单位
    private String sJYL;//VARCHAR2(20)  Y药房包装
    private Integer pSPB;//NUMBER(1)    Y实际用量
    private Integer yYTS;//INTEGER      Y皮试判别
    private Integer yCSL2;//NUMBER(10,4)Y用药天数
    private Integer xSSL;//NUMBER(10,4) Y一次用量
    private Integer mRCS;//NUMBER(2)    N显示数量
    private String cFBZ;//VARCHAR2(40)  Y每日次数
    private Integer yCJL;//NUMBER(10,2) Y处方标志
    private Integer pSJG;//NUMBER(1)    Y一次剂量
    private Integer pLXH;//NUMBER(4)    Y皮试结果
    private Integer sYBZ;//NUMBER(1)    Y排列序号
    private Integer zBBZ;//NUMBER(1)    Y输液标志；1 输液调入   0 或 NULL 未调入
    private Integer yDFYBZ;//NUMBER(1)  Y药店发药标志
    private Integer tYSQSL;//NUMBER(5)  Y退药申请数量
    private Date yDFYRQ;//DATE          Y药店发药人
    private String yDFYR;//VARCHAR2(20) Y药店发药日期
    private Integer cZGH;//NUMBER(8)    Y操作工号
    private Date cZRQ;//DATE            Y操作日期
    private Integer zJFLAG;//NUMBER(1)  Y
    private Integer mBYF;//NUMBER(1)    Y
    private String bZ;//VARCHAR2(200)   Y备注
    private Integer jHJG;//NUMBER(12,4) Y进货价格
    private Integer sPZT;//NUMBER(1)    Y0审批状态        0表示未审批   1表示审批通过   2表示审批未通过
    private String tHYY;//VARCHAR2(200) Y退回原因
    @Basic
    @Id
    @Column(name = "SBXH")
    public Integer getSBXH() {
        return SBXH;
        return sBXH;
    }
    public void setSBXH(Integer SBXH) {
        this.SBXH = SBXH;
    public void setSBXH(Integer sBXH) {
        this.sBXH = sBXH;
    }
    @Basic
    @Column(name = "CFSB")
    public Integer getCFSB() {
        return CFSB;
        return cFSB;
    }
    public void setCFSB(Integer CFSB) {
        this.CFSB = CFSB;
    public void setCFSB(Integer cFSB) {
        this.cFSB = cFSB;
    }
    @Basic
    @Column(name = "YPXH")
    public Integer getYPXH() {
        return YPXH;
        return yPXH;
    }
    public void setYPXH(Integer YPXH) {
        this.YPXH = YPXH;
    public void setYPXH(Integer yPXH) {
        this.yPXH = yPXH;
    }
    @Basic
    @Column(name = "YPCD")
    public Integer getYPCD() {
        return YPCD;
        return yPCD;
    }
    public void setYPCD(Integer YPCD) {
        this.YPCD = YPCD;
    public void setYPCD(Integer yPCD) {
        this.yPCD = yPCD;
    }
    @Basic
    @Column(name = "XMLX")
    public Integer getXMLX() {
        return XMLX;
        return xMLX;
    }
    public void setXMLX(Integer XMLX) {
        this.XMLX = XMLX;
    public void setXMLX(Integer xMLX) {
        this.xMLX = xMLX;
    }
    @Basic
    @Column(name = "CFTS")
    public Integer getCFTS() {
        return CFTS;
        return cFTS;
    }
    public void setCFTS(Integer CFTS) {
        this.CFTS = CFTS;
    public void setCFTS(Integer cFTS) {
        this.cFTS = cFTS;
    }
    @Basic
    @Column(name = "YPSL")
    public Integer getYPSL() {
        return YPSL;
        return yPSL;
    }
    public void setYPSL(Integer YPSL) {
        this.YPSL = YPSL;
    public void setYPSL(Integer yPSL) {
        this.yPSL = yPSL;
    }
    @Basic
    @Column(name = "YPDJ")
    public Integer getYPDJ() {
        return YPDJ;
        return yPDJ;
    }
    public void setYPDJ(Integer YPDJ) {
        this.YPDJ = YPDJ;
    public void setYPDJ(Integer yPDJ) {
        this.yPDJ = yPDJ;
    }
    @Basic
    @Column(name = "HJJE")
    public Integer getHJJE() {
        return HJJE;
        return hJJE;
    }
    public void setHJJE(Integer HJJE) {
        this.HJJE = HJJE;
    public void setHJJE(Integer hJJE) {
        this.hJJE = hJJE;
    }
    @Basic
    @Column(name = "YPZS")
    public Integer getYPZS() {
        return YPZS;
        return yPZS;
    }
    public void setYPZS(Integer YPZS) {
        this.YPZS = YPZS;
    public void setYPZS(Integer yPZS) {
        this.yPZS = yPZS;
    }
    @Basic
    @Column(name = "YCSL")
    public String getYCSL() {
        return YCSL;
        return yCSL;
    }
    public void setYCSL(String YCSL) {
        this.YCSL = YCSL;
    public void setYCSL(String yCSL) {
        this.yCSL = yCSL;
    }
    @Basic
    @Column(name = "FYGB")
    public Integer getFYGB() {
        return FYGB;
        return fYGB;
    }
    public void setFYGB(Integer FYGB) {
        this.FYGB = FYGB;
    public void setFYGB(Integer fYGB) {
        this.fYGB = fYGB;
    }
    @Basic
    @Column(name = "ZFBL")
    public Integer getZFBL() {
        return ZFBL;
        return zFBL;
    }
    public void setZFBL(Integer ZFBL) {
        this.ZFBL = ZFBL;
    public void setZFBL(Integer zFBL) {
        this.zFBL = zFBL;
    }
    @Basic
    @Column(name = "GYTJ")
    public Integer getGYTJ() {
        return GYTJ;
        return gYTJ;
    }
    public void setGYTJ(Integer GYTJ) {
        this.GYTJ = GYTJ;
    public void setGYTJ(Integer gYTJ) {
        this.gYTJ = gYTJ;
    }
    @Basic
    @Column(name = "YPYF")
    public String getYPYF() {
        return YPYF;
        return yPYF;
    }
    public void setYPYF(String YPYF) {
        this.YPYF = YPYF;
    public void setYPYF(String yPYF) {
        this.yPYF = yPYF;
    }
    @Basic
    @Column(name = "YPZH")
    public Integer getYPZH() {
        return YPZH;
        return yPZH;
    }
    public void setYPZH(Integer YPZH) {
        this.YPZH = YPZH;
    public void setYPZH(Integer yPZH) {
        this.yPZH = yPZH;
    }
    @Basic
    @Column(name = "YFGG")
    public String getYFGG() {
        return YFGG;
        return yFGG;
    }
    public void setYFGG(String YFGG) {
        this.YFGG = YFGG;
    public void setYFGG(String yFGG) {
        this.yFGG = yFGG;
    }
    @Basic
    @Column(name = "YFDW")
    public String getYFDW() {
        return YFDW;
        return yFDW;
    }
    public void setYFDW(String YFDW) {
        this.YFDW = YFDW;
    public void setYFDW(String yFDW) {
        this.yFDW = yFDW;
    }
    @Basic
    @Column(name = "YFBZ")
    public Integer getYFBZ() {
        return YFBZ;
        return yFBZ;
    }
    public void setYFBZ(Integer YFBZ) {
        this.YFBZ = YFBZ;
    public void setYFBZ(Integer yFBZ) {
        this.yFBZ = yFBZ;
    }
    @Basic
    @Column(name = "SJYL")
    public String getSJYL() {
        return SJYL;
        return sJYL;
    }
    public void setSJYL(String SJYL) {
        this.SJYL = SJYL;
    public void setSJYL(String sJYL) {
        this.sJYL = sJYL;
    }
    @Basic
    @Column(name = "PSPB")
    public Integer getPSPB() {
        return PSPB;
        return pSPB;
    }
    public void setPSPB(Integer PSPB) {
        this.PSPB = PSPB;
    public void setPSPB(Integer pSPB) {
        this.pSPB = pSPB;
    }
    @Basic
    @Column(name = "YYTS")
    public Integer getYYTS() {
        return YYTS;
        return yYTS;
    }
    public void setYYTS(Integer YYTS) {
        this.YYTS = YYTS;
    public void setYYTS(Integer yYTS) {
        this.yYTS = yYTS;
    }
    @Basic
    @Column(name = "YCSL2")
    public Integer getYCSL2() {
        return YCSL2;
        return yCSL2;
    }
    public void setYCSL2(Integer YCSL2) {
        this.YCSL2 = YCSL2;
    public void setYCSL2(Integer yCSL2) {
        this.yCSL2 = yCSL2;
    }
    @Basic
    @Column(name = "XSSL")
    public Integer getXSSL() {
        return XSSL;
        return xSSL;
    }
    public void setXSSL(Integer XSSL) {
        this.XSSL = XSSL;
    public void setXSSL(Integer xSSL) {
        this.xSSL = xSSL;
    }
    @Basic
    @Column(name = "MRCS")
    public Integer getMRCS() {
        return MRCS;
        return mRCS;
    }
    public void setMRCS(Integer MRCS) {
        this.MRCS = MRCS;
    public void setMRCS(Integer mRCS) {
        this.mRCS = mRCS;
    }
    @Basic
    @Column(name = "CFBZ")
    public String getCFBZ() {
        return CFBZ;
        return cFBZ;
    }
    public void setCFBZ(String CFBZ) {
        this.CFBZ = CFBZ;
    public void setCFBZ(String cFBZ) {
        this.cFBZ = cFBZ;
    }
    @Basic
    @Column(name = "YCJL")
    public Integer getYCJL() {
        return YCJL;
        return yCJL;
    }
    public void setYCJL(Integer YCJL) {
        this.YCJL = YCJL;
    public void setYCJL(Integer yCJL) {
        this.yCJL = yCJL;
    }
    @Basic
    @Column(name = "PSJG")
    public Integer getPSJG() {
        return PSJG;
        return pSJG;
    }
    public void setPSJG(Integer PSJG) {
        this.PSJG = PSJG;
    public void setPSJG(Integer pSJG) {
        this.pSJG = pSJG;
    }
    @Basic
    @Column(name = "PLXH")
    public Integer getPLXH() {
        return PLXH;
        return pLXH;
    }
    public void setPLXH(Integer PLXH) {
        this.PLXH = PLXH;
    public void setPLXH(Integer pLXH) {
        this.pLXH = pLXH;
    }
    @Basic
    @Column(name = "SYBZ")
    public Integer getSYBZ() {
        return SYBZ;
        return sYBZ;
    }
    public void setSYBZ(Integer SYBZ) {
        this.SYBZ = SYBZ;
    public void setSYBZ(Integer sYBZ) {
        this.sYBZ = sYBZ;
    }
    @Basic
    @Column(name = "ZBBZ")
    public Integer getZBBZ() {
        return ZBBZ;
        return zBBZ;
    }
    public void setZBBZ(Integer ZBBZ) {
        this.ZBBZ = ZBBZ;
    public void setZBBZ(Integer zBBZ) {
        this.zBBZ = zBBZ;
    }
    @Basic
    @Column(name = "YDFYBZ")
    public Integer getYDFYBZ() {
        return YDFYBZ;
        return yDFYBZ;
    }
    public void setYDFYBZ(Integer YDFYBZ) {
        this.YDFYBZ = YDFYBZ;
    public void setYDFYBZ(Integer yDFYBZ) {
        this.yDFYBZ = yDFYBZ;
    }
    @Basic
    @Column(name = "TYSQSL")
    public Integer getTYSQSL() {
        return TYSQSL;
        return tYSQSL;
    }
    public void setTYSQSL(Integer TYSQSL) {
        this.TYSQSL = TYSQSL;
    public void setTYSQSL(Integer tYSQSL) {
        this.tYSQSL = tYSQSL;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Basic
    @Column(name = "YDFYRQ")
    public Date getYDFYRQ() {
        return YDFYRQ;
        return yDFYRQ;
    }
    public void setYDFYRQ(Date YDFYRQ) {
        this.YDFYRQ = YDFYRQ;
    public void setYDFYRQ(Date yDFYRQ) {
        this.yDFYRQ = yDFYRQ;
    }
    @Basic
    @Column(name = "YDFYR")
    public String getYDFYR() {
        return YDFYR;
        return yDFYR;
    }
    public void setYDFYR(String YDFYR) {
        this.YDFYR = YDFYR;
    public void setYDFYR(String yDFYR) {
        this.yDFYR = yDFYR;
    }
    @Basic
    @Column(name = "CZGH")
    public Integer getCZGH() {
        return CZGH;
        return cZGH;
    }
    public void setCZGH(Integer CZGH) {
        this.CZGH = CZGH;
    public void setCZGH(Integer cZGH) {
        this.cZGH = cZGH;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Basic
    @Column(name = "CZRQ")
    public Date getCZRQ() {
        return CZRQ;
        return cZRQ;
    }
    public void setCZRQ(Date CZRQ) {
        this.CZRQ = CZRQ;
    public void setCZRQ(Date cZRQ) {
        this.cZRQ = cZRQ;
    }
    @Basic
    @Column(name = "ZJFLAG")
    public Integer getZJFLAG() {
        return ZJFLAG;
        return zJFLAG;
    }
    public void setZJFLAG(Integer ZJFLAG) {
        this.ZJFLAG = ZJFLAG;
    public void setZJFLAG(Integer zJFLAG) {
        this.zJFLAG = zJFLAG;
    }
    @Basic
    @Column(name = "MBYF")
    public Integer getMBYF() {
        return MBYF;
        return mBYF;
    }
    public void setMBYF(Integer MBYF) {
        this.MBYF = MBYF;
    public void setMBYF(Integer mBYF) {
        this.mBYF = mBYF;
    }
    @Basic
    @Column(name = "BZ")
    public String getBZ() {
        return BZ;
        return bZ;
    }
    public void setBZ(String BZ) {
        this.BZ = BZ;
    public void setBZ(String bZ) {
        this.bZ = bZ;
    }
    @Basic
    @Column(name = "JHJG")
    public Integer getJHJG() {
        return JHJG;
        return jHJG;
    }
    public void setJHJG(Integer JHJG) {
        this.JHJG = JHJG;
    public void setJHJG(Integer jHJG) {
        this.jHJG = jHJG;
    }
    @Basic
    @Column(name = "SPZT")
    public Integer getSPZT() {
        return SPZT;
        return sPZT;
    }
    public void setSPZT(Integer SPZT) {
        this.SPZT = SPZT;
    public void setSPZT(Integer sPZT) {
        this.sPZT = sPZT;
    }
    @Basic
    @Column(name = "THYY")
    public String getTHYY() {
        return THYY;
        return tHYY;
    }
    public void setTHYY(String THYY) {
        this.THYY = THYY;
    public void setTHYY(String tHYY) {
        this.tHYY = tHYY;
    }

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -408,7 +408,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "wlyy_health_bank_task_patient_detail" +
                " WHERE " +
                " patient_idcard = '"+activityDO.getPatientIdcard()+"' "+ condition+")" +
                " ) AND del_flag =1 " +condition1+
                " ) AND del_flag =1 " +condition1+" order by create_time DESC "+
                " LIMIT "+(page-1)*size +","+size;
        List<ActivityDO> activityDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ActivityDO.class));
        for (ActivityDO activityDO1:activityDOS){