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

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

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

@@ -3094,6 +3094,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            rs.put("backgroundId",doctorDO.getBackgroundId());//背景图id
            rs.put("visitDeptName",doctorDO.getVisitDeptName());//出诊科室
            rs.put("visitDept",doctorDO.getVisitDept());
            rs.put("learning",doctorDO.getLearning());
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
@@ -3279,7 +3280,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return rs;
    }
    public BaseDoctorDO updateDoctorInfo(String id, String img,String background,String expertise,String visitHospital,String visitHospitalName,String visitDept,String visitDeptName,String backgroundId){
    public BaseDoctorDO updateDoctorInfo(String id, String img,String background,String expertise,String visitHospital,String visitHospitalName,String visitDept,String visitDeptName,String backgroundId,String name,Integer sex,String learning){
        if (StringUtils.isNoneBlank(id)){
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(id);
            if (StringUtils.isNoneBlank(img)){
@@ -3311,6 +3312,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            if (StringUtils.isNoneBlank(backgroundId)){
                baseDoctorDO.setBackgroundId(backgroundId);
            }
            if(StringUtils.isNoneBlank(name)){
                baseDoctorDO.setName(name);
            }
            if(StringUtils.isNoneBlank(learning)){
                baseDoctorDO.setLearning(learning);
            }
            if (sex!=null){
                baseDoctorDO.setSex(sex);
            }
            return baseDoctorDao.save(baseDoctorDO);
        }else {
            return null;
@@ -3342,6 +3354,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            rs.put("backgroundId",doctorDO.getBackgroundId());//背景图id
            rs.put("visitDeptName",doctorDO.getVisitDeptName());//出诊科室
            rs.put("visitDept",doctorDO.getVisitDept());
            rs.put("learning",doctorDO.getLearning());
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());

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

@@ -230,6 +230,12 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
     */
    private String backgroundId;
    /**
     * 学术背景
     */
    private String learning;
	@Column(name = "password")
    public String getPassword() {
        return password;
@@ -575,4 +581,14 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    public void setBackgroundId(String backgroundId) {
        this.backgroundId = backgroundId;
    }
    @Column(name = "learning")
    public String getLearning() {
        return learning;
    }
    public void setLearning(String learning) {
        this.learning = learning;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -586,9 +586,15 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                       @ApiParam(name = "visitDeptName", value = "出诊科室名称")
                                           @RequestParam(value = "visitDeptName", required = false)String visitDeptName,
                                       @ApiParam(name = "backgroundId", value = "背景id")
                                           @RequestParam(value = "backgroundId", required = false)String backgroundId){
                                           @RequestParam(value = "backgroundId", required = false)String backgroundId,
                                       @ApiParam(name = "name", value = "姓名")
                                           @RequestParam(value = "name", required = false)String name,
                                       @ApiParam(name = "sex", value = "性别")
                                           @RequestParam(value = "sex", required = false)Integer sex,
                                       @ApiParam(name = "learning", value = "学术背景")
                                           @RequestParam(value = "learning", required = false)String learning){
        try {
            return success(prescriptionService.updateDoctorInfo(id, img,background,expertise, visitHospital, visitHospitalName, visitDept, visitDeptName, backgroundId));
            return success(prescriptionService.updateDoctorInfo(id, img,background,expertise, visitHospital, visitHospitalName, visitDept, visitDeptName, backgroundId,name,sex,learning));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError(e.getMessage());