互联网医院

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

@@ -179,7 +179,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     */
    public List<WlyyPrescriptionVO> findOriginPrescriptionList(String registerSn,String patient,String admNo,boolean demoFlag)throws Exception{
        String patNo =patientMappingService.findHisPatNoByPatient(patient);
        return entranceService.BS16017(registerSn,patNo,admNo,null,demoFlag);
        //BS16017(String REGISTER_SN,String realOrder,String PAT_NO,String ADM_NO,boolean demoFlag) throws Exception {
        return entranceService.BS16017(registerSn,null,patNo,admNo,demoFlag);
    }
    /**
@@ -193,8 +194,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @throws Exception
     */
    public WlyyPrescriptionVO findOriginPrescription(String registerSn, String patNo, String admNo, String realOrder, boolean demoFlag)throws Exception{
        //    public List<WlyyPrescriptionVO>  BS16017(String REGISTER_SN,String realOrder,String PAT_NO,String ADM_NO,boolean demoFlag) throws Exception {
        List<WlyyPrescriptionVO> rs = entranceService.BS16017(registerSn,realOrder,admNo,patNo,demoFlag);
        List<WlyyPrescriptionVO> rs = entranceService.BS16017(registerSn,realOrder,patNo,admNo,demoFlag);
        if(rs!=null&&rs.size()>0){
            return rs.get(0);
        }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalWaitingRoomDO.java

@@ -64,6 +64,16 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
     */
    private String doctorName;
    /**
     * 全科医生
     */
    private String generalDoctor;
    /**
     * 全科医生名称
     */
    private String generalDoctorName;
    /**
	 * 0离线 1在线(候诊) 2已诊
	 */
@@ -229,6 +239,24 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
        this.doctorName = doctorName;
    }
    @Column(name = "general_doctor")
    public String getGeneralDoctor() {
        return generalDoctor;
    }
    public void setGeneralDoctor(String generalDoctor) {
        this.generalDoctor = generalDoctor;
    }
    @Column(name = "general_doctor_name")
    public String getGeneralDoctorName() {
        return generalDoctorName;
    }
    public void setGeneralDoctorName(String generalDoctorName) {
        this.generalDoctorName = generalDoctorName;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;

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

@@ -49,6 +49,10 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
     */
    private String conNo;
    /**
     * 1.在线复诊2.协同门诊
     */
    private String outpatientType;
    /**
     * 1.图文 2.视频
     */
@@ -99,6 +103,16 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
	 */
	private String doctorName;
    /**
     * 全科医生
     */
    private String generalDoctor;
    /**
     * 全科医生名称
     */
    private String generalDoctorName;
    /**
	 * 身份证号
	 */
@@ -217,6 +231,15 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
        this.originRegisterNo = originRegisterNo;
    }
    @Column(name = "outpatient_type")
    public String getOutpatientType() {
        return outpatientType;
    }
    public void setOutpatientType(String outpatientType) {
        this.outpatientType = outpatientType;
    }
    @Column(name = "type")
    public String getType() {
        return type;
@@ -292,7 +315,25 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
        this.doctorName = doctorName;
    }
	@Column(name = "idcard")
    @Column(name = "general_doctor")
    public String getGeneralDoctor() {
        return generalDoctor;
    }
    public void setGeneralDoctor(String generalDoctor) {
        this.generalDoctor = generalDoctor;
    }
    @Column(name = "general_doctor_name")
    public String getGeneralDoctorName() {
        return generalDoctorName;
    }
    public void setGeneralDoctorName(String generalDoctorName) {
        this.generalDoctorName = generalDoctorName;
    }
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
    }