海沧医保接口

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorInfoService.java

@@ -80,7 +80,7 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
     * @param page
     * @param pageSize
     */
    public Envelop queryList(String city, String hospital, String status, String name, String type, String typeCode, String dept, int page, int pageSize){
    public Envelop queryList(String city, String hospital, String status,String chargeType,String conditionKey, String name, String type, String typeCode, String dept, int page, int pageSize){
        Map<String,Object> params = new HashedMap();
        String sqlTotal ="SELECT " +
                " COUNT(1) AS \"total\" " +
@@ -103,6 +103,15 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
            sqlTotal += " AND a.del =:status";
            params.put("status",status);
        }
        if (StringUtils.isNotBlank(chargeType)){
            sqlTotal += " AND (a.twfz_charge_type=:chargeType or a.spfz_charge_type=:chargeType or a.xtfz_charge_type=:chargeType or a.xgsz_charge_type=:chargeType) ";
            params.put("chargeType",chargeType);
        }
        if (StringUtils.isNotBlank(conditionKey)){
            conditionKey = "%"+conditionKey+"%";
            sqlTotal += " AND (a.name like:conditionKey or a.idcard like:conditionKey or a.mobile like :conditionKey)";
            params.put("conditionKey",conditionKey);
        }
        if (StringUtils.isNotBlank(name)){
            name = "%"+name+"%";
            sqlTotal += " AND (a.name like:name or b.dept_name like:name or c.mapping_code like :name)";
@@ -133,6 +142,10 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                " a.NAME AS \"name\", " +
                " a.introduce AS \"introduce\", " +
                " a.expertise AS \"expertise\", " +
                " a.idcard AS \"idcard\", " +
                " a.job_title_code AS \"jobTitleCode\", " +
                " a.mobile AS \"mobile\", " +
                " a.job_title_name AS \"jobTitleName\", " +
                " a.outpatient_type AS \"outpatientType\", " +
                " a.del AS \"del\", " +
                " b.dept_name AS \"deptName\", " +
@@ -146,12 +159,14 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                "\tv.req_fee as \"twzxFee\",\n" +
                "\td.req_fee as \"xtzxFee\",\n" +
                "\tg.req_fee as \"jyzxFee\",\n" +
                "\th.req_fee as \"xgszFee\",\n" +
                "\tm.charge_type as \"twfzType\",\n" +
                "\tn.charge_type as \"spfzType\",\n" +
                "\tp.charge_type as \"spzxType\",\n" +
                "\tv.charge_type as \"twzxType\",\n" +
                "\td.charge_type as \"xtzxType\",\n" +
                "\tg.charge_type as \"jyzxType\"\n" +
                "\tg.charge_type as \"jyzxType\",\n" +
                "\th.charge_type as \"xgszType\"\n" +
                " FROM " +
                " base_doctor a " +
                " JOIN base_doctor_hospital b ON a.id = b.doctor_code " +
@@ -162,6 +177,7 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                " LEFT JOIN wlyy_charge_dict v ON a.twzx_charge_type = v.charge_type and v.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict d ON a.xtfz_charge_type = d.charge_type and d.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict g ON a.jyzx_charge_type = g.charge_type and g.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict h ON a.xgsz_charge_type = h.charge_type and h.is_del='1'\n" +
                " LEFT JOIN base_doctor_mapping c ON a.id = c.doctor " +
                " WHERE 1=1";
        if (StringUtils.isNotBlank(city)){
@@ -173,8 +189,19 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
        if (StringUtils.isNotBlank(status)){
            sql += " AND a.del =:status";
        }
        if (StringUtils.isNotBlank(chargeType)){
            sql += " AND (a.twfz_charge_type=:chargeType or a.spfz_charge_type=:chargeType or a.xtfz_charge_type=:chargeType or a.xgsz_charge_type=:chargeType) ";
            params.put("chargeType",chargeType);
        }
        if (StringUtils.isNotBlank(conditionKey)){
            conditionKey = "%"+conditionKey+"%";
            sql += " AND (a.name like:conditionKey or a.idcard like:conditionKey or a.mobile like :conditionKey)";
            params.put("conditionKey",conditionKey);
        }
        if (StringUtils.isNotBlank(name)){
            name = "%"+name+"%";
            sql += " AND (a.name like:name or b.dept_name like:name or c.mapping_code like:name)";
            params.put("name",name);
        }
        if (StringUtils.isNotBlank(type)){
            sql += " AND a.outpatient_type like:type";
@@ -204,6 +231,9 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                " a.id AS \"id\", " +
                " a.NAME AS \"name\", " +
                " a.job_title_name AS \"jobTitleName\", " +
                " a.idcard AS \"idcard\", " +
                " a.job_title_code AS \"jobTitleCode\", " +
                " a.mobile AS \"mobile\", " +
                " a.introduce AS \"introduce\", " +
                " a.expertise AS \"expertise\", " +
                " a.photo AS \"photo\", " +
@@ -221,12 +251,14 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                "\tv.req_fee as \"twzxFee\",\n" +
                "\tq.req_fee as \"xtzxFee\",\n" +
                "\tg.req_fee as \"jyzxFee\",\n" +
                "\tk.req_fee as \"xgszFee\",\n" +
                "\tm.charge_type as \"twfzType\",\n" +
                "\tn.charge_type as \"spfzType\",\n" +
                "\tp.charge_type as \"spzxType\",\n" +
                "\tv.charge_type as \"twzxType\",\n" +
                "\tq.charge_type as \"xtzxType\",\n" +
                "\tg.charge_type as \"jyzxType\"\n" +
                "\tg.charge_type as \"jyzxType\",\n" +
                "\tk.charge_type as \"xgszType\"\n" +
                " FROM " +
                " base_doctor a " +
                " LEFT JOIN base_doctor_hospital b ON a.id = b.doctor_code " +
@@ -240,6 +272,7 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                " LEFT JOIN wlyy_charge_dict v ON a.twzx_charge_type = v.charge_type and v.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict q ON a.xtfz_charge_type = q.charge_type and q.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict g ON a.jyzx_charge_type = g.charge_type and g.is_del='1'\n" +
                " LEFT JOIN wlyy_charge_dict k ON a.xgsz_charge_type = k.charge_type and k.is_del='1'\n" +
                " WHERE 1=1 ";
        if(StringUtils.isNotBlank(doctorId)){
            sql+=" AND a.id =:id";
@@ -296,17 +329,24 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
    public Boolean update(JSONObject jsonObject)throws Exception{
        //取出数据
        String doctorId = jsonObject.get("doctorId").toString();
        String introduce = jsonObject.get("introduce").toString();
        String expertise = jsonObject.get("expertise").toString();
        String photo = jsonObject.get("photo").toString();
        String outpatientType = jsonObject.get("outpatientType").toString();
        String newSpecialDisease = jsonObject.get("specialDisease").toString();
        String newSpecialDiseaseCode = jsonObject.get("specialDiseaseCode").toString();
        String introduce = jsonObject.get("introduce")!=null?jsonObject.getString("introduce"):null;
        String expertise = jsonObject.get("expertise")!=null?jsonObject.getString("expertise"):null;
        String photo = jsonObject.get("photo")!=null?jsonObject.getString("photo"):null;
        String outpatientType = jsonObject.get("outpatientType")!=null?jsonObject.getString("outpatientType"):null;
        String newSpecialDisease = jsonObject.get("specialDisease")!=null?jsonObject.getString("specialDisease"):null;
        String newSpecialDiseaseCode = jsonObject.get("specialDiseaseCode")!=null?jsonObject.getString("specialDiseaseCode"):null;
        BaseDoctorDO doctorDO = baseDoctorDao.findOne(doctorId);
        if (doctorDO!=null){
            doctorDO.setIntroduce(introduce);
            doctorDO.setExpertise(expertise);
            doctorDO.setPhoto(photo);
            if (StringUtils.isNoneBlank(introduce)){
                doctorDO.setIntroduce(introduce);
            }
            if (StringUtils.isNoneBlank(expertise)){
                doctorDO.setExpertise(expertise);
            }
            if (StringUtils.isNoneBlank(photo)){
                doctorDO.setPhoto(photo);
            }
            if(StringUtils.isNoneBlank(outpatientType)){
                doctorDO.setOutpatientType(outpatientType);
            }else {
@@ -360,28 +400,44 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
                    doctorDO.setXtfzChargeType(jsonObject.get("XTFZType").toString());
                }
            }
            if (StringUtils.isNoneBlank(jsonObject.get("XTFZFee")==null?"":jsonObject.get("XTFZFee").toString())){
                String chargeType = findOrCreateChargeType(jsonObject.get("XTFZFee").toString(),doctorDO.getName());
                doctorDO.setXtfzChargeType(chargeType);
            }else {
                if (jsonObject.get("XTFZType")!=null){
                    doctorDO.setXtfzChargeType(jsonObject.get("XTFZType").toString());
                }
            }
            if (StringUtils.isNoneBlank(jsonObject.get("XGSZFee")==null?"":jsonObject.get("XGSZFee").toString())){
                String chargeType = findOrCreateChargeType(jsonObject.get("XGSZFee").toString(),doctorDO.getName());
                doctorDO.setXgszChargeType(chargeType);
            }else {
                if (jsonObject.get("XGSZType")!=null){
                    doctorDO.setXgszChargeType(jsonObject.get("XGSZType").toString());
                }
            }
        }
        //baseDoctorDao.update(doctorId,introduce,expertise,photo,outpatientType);
        baseDoctorDao.save(doctorDO);
        //删除医生旧专病门诊，保存新专病门诊
        Map<String,Object> params = new HashedMap();
        String sqlTotal ="SELECT " +
                " COUNT(1) AS \"total\" " +
                " FROM " +
                " wlyy_doctor_special_disease a " +
                " WHERE " +
                " 1 = 1";
        sqlTotal += " AND a.doctor_code =:doctorId";
        params.put("doctorId",doctorId);
        Long count = 0L;
        List<Map<String, Object>> total = hibenateUtils.createSQLQuery(sqlTotal, params);
        //mysql 与 Oracle 聚合函数返回类型不一致，需要判断装换
        count = hibenateUtils.objTransformLong(total.get(0).get("total"));
        if (count > 0){
            specialDiseaseDao.deleteByDoctorCode(doctorId);
        }
        if(StringUtils.isNotBlank(newSpecialDisease) && StringUtils.isNotBlank(newSpecialDiseaseCode)){
            //删除医生旧专病门诊，保存新专病门诊
            Map<String,Object> params = new HashedMap();
            String sqlTotal ="SELECT " +
                    " COUNT(1) AS \"total\" " +
                    " FROM " +
                    " wlyy_doctor_special_disease a " +
                    " WHERE " +
                    " 1 = 1";
            sqlTotal += " AND a.doctor_code =:doctorId";
            params.put("doctorId",doctorId);
            Long count = 0L;
            List<Map<String, Object>> total = hibenateUtils.createSQLQuery(sqlTotal, params);
            //mysql 与 Oracle 聚合函数返回类型不一致，需要判断装换
            count = hibenateUtils.objTransformLong(total.get(0).get("total"));
            if (count > 0){
                specialDiseaseDao.deleteByDoctorCode(doctorId);
            }
            String[] split = newSpecialDisease.split(",");
            String[] splitCode = newSpecialDiseaseCode.split(",");
            specialDiseaseDao.deleteByDoctorCode(doctorId);

business/base-service/src/main/java/com/yihu/jw/hospital/dict/WlyyChargeDictDao.java

@@ -24,4 +24,7 @@ public interface WlyyChargeDictDao extends PagingAndSortingRepository<WlyyCharge
    @Query("from WlyyChargeDictDO d where d.reqFee = ?1 and d.isDel='1' ")
    WlyyChargeDictDO  findByReqFee(Double reqFee);
    @Query("from WlyyChargeDictDO d where d.code = ?1 and d.isDel='1' ")
    WlyyChargeDictDO  findByCode(String code);
}

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

@@ -487,7 +487,7 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     */
    public List<WlyyPrescriptionEmrDO> selectHistoryEmr(String patientId,String eventNo) throws Exception {
        List<WlyyPrescriptionEmrDO> wlyyPrescriptionEmrDOList = new ArrayList<>();
        String obj = hcyyEntranceService.SelectEmrInfo(patientId,patientId);
        String obj = hcyyEntranceService.SelectEmrInfo(patientId,eventNo);
        if("[[]]".equalsIgnoreCase(obj)||"[]".equalsIgnoreCase(obj)||StringUtils.isBlank(obj)){
            return null;
        }else {
@@ -670,6 +670,14 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                    wlyyInspectionVOList.add(inspectionVO);
                }
                wlyyPrescriptionVO.setInspectionVOs(wlyyInspectionVOList);
                try {
                    List<WlyyPrescriptionEmrDO> listEmr = selectHistoryEmr(patNo,registerSn);
                    if (null!=listEmr&&listEmr.size()>0){
                        wlyyPrescriptionVO.setWlyyPrescriptionEmrDO(listEmr.get(0));
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                }
                prescriptionVOList.add(wlyyPrescriptionVO);
            }
        }
@@ -1816,7 +1824,7 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                throw new Exception("未找到待结算记录");
            }
            YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
            if (ylzMedicalRelationDO.getState()!=null&&ylzMedicalRelationDO.getState()==1){
            if (ylzMedicalRelationDO!=null&&ylzMedicalRelationDO.getState()!=null&&ylzMedicalRelationDO.getState()==1){
                return "已结算";
            }
            BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(ylzMedicalRelationDO.getId());

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

@@ -755,6 +755,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        rs.put("diseaseCode",outpatientDO.getDiseaseCode());
        rs.put("diseaseName",outpatientDO.getDiseaseName());
        rs.put("inquirySign",outpatientDO.getInquirySign());
        rs.put("visitType",outpatientDO.getVisitType());
        rs.put("virusFlag",outpatientDO.getVirusFlag());
        String hisPatient="";
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(basePatientDO.getId());
        if(null!=patientMappingDO){
@@ -1121,20 +1123,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        Double price = 0.0;
        String chargeType1 = null;
        if (doctorDO!=null){
            if (outpatient.getOutpatientType().equalsIgnoreCase("1")){
                if(outpatientDO.getType().equalsIgnoreCase("1")){
                    chargeType1 = doctorDO.getTwfzChargeType();
                }else if(outpatientDO.getType().equalsIgnoreCase("2")){
                    chargeType1 = doctorDO.getSpfzChargeType();
                }
            }else if (outpatient.getOutpatientType().equalsIgnoreCase("3")){
                if(outpatientDO.getType().equalsIgnoreCase("1")){
                    chargeType1 = doctorDO.getTwzxChargeType();
                }else if(outpatientDO.getType().equalsIgnoreCase("2")){
                    chargeType1 = doctorDO.getSpzxChargeType();
            if (!StringUtils.isNoneBlank(outpatient.getVisitType())||outpatient.getVisitType().equalsIgnoreCase("2")){
                if (outpatient.getOutpatientType().equalsIgnoreCase("1")){
                    if(outpatientDO.getType().equalsIgnoreCase("1")){
                        chargeType1 = doctorDO.getTwfzChargeType();
                    }else if(outpatientDO.getType().equalsIgnoreCase("2")){
                        chargeType1 = doctorDO.getSpfzChargeType();
                    }
                }else if (outpatient.getOutpatientType().equalsIgnoreCase("3")){
                    if(outpatientDO.getType().equalsIgnoreCase("1")){
                        chargeType1 = doctorDO.getTwzxChargeType();
                    }else if(outpatientDO.getType().equalsIgnoreCase("2")){
                        chargeType1 = doctorDO.getSpzxChargeType();
                    }
                }else if (outpatient.getOutpatientType().equalsIgnoreCase("2")){
                    chargeType1 = doctorDO.getXtfzChargeType();
                }
            }else if (outpatient.getOutpatientType().equalsIgnoreCase("2")){
                chargeType1 = doctorDO.getXtfzChargeType();
            }else if (StringUtils.isNoneBlank(outpatient.getVisitType())&&outpatient.getVisitType().equalsIgnoreCase("1")){
                chargeType1 = doctorDO.getXgszChargeType();
            }
            if(doctorDO!=null){
                if (StringUtils.isNoneBlank(chargeType1)){
@@ -4503,6 +4509,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            rs.put("idCard",doctorDO.getIdcard());
            rs.put("idCardType",doctorDO.getIdCardType());
            rs.put("mark",doctorDO.getMark());
            rs.put("twzxChargeType",doctorDO.getTwzxChargeType());
            rs.put("twfzChargeType",doctorDO.getTwfzChargeType());
            rs.put("spzxChargeType",doctorDO.getSpzxChargeType());
            rs.put("spfzChargeType",doctorDO.getSpfzChargeType());
            rs.put("jyzxChargeType",doctorDO.getJyzxChargeType());
            rs.put("xtfzChargeType",doctorDO.getXtfzChargeType());
            rs.put("xgszChargeType",doctorDO.getXgszChargeType());
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String sqlCharge = "SELECT\n" +
                    "\tm.req_fee as \"twfzFee\",\n" +
@@ -4510,7 +4523,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "\tb.req_fee as \"spzxFee\",\n" +
                    "\tv.req_fee as \"twzxFee\",\n" +
                    "\tg.req_fee as \"jyzxFee\",\n" +
                    "\td.req_fee as \"xtzxFee\"\n" +
                    "\td.req_fee as \"xtzxFee\",\n" +
                    "\th.req_fee as \"xgszFee\"\n" +
                    "FROM\n" +
                    "\tbase_doctor t\n" +
                    "LEFT JOIN wlyy_charge_dict m ON t.twfz_charge_type = m.charge_type and m.is_del='1'\n" +
@@ -4519,6 +4533,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "LEFT JOIN wlyy_charge_dict v ON t.twzx_charge_type = v.charge_type and v.is_del='1'\n" +
                    "LEFT JOIN wlyy_charge_dict d ON t.xtfz_charge_type = d.charge_type and d.is_del='1'\n" +
                    " LEFT JOIN wlyy_charge_dict g ON t.jyzx_charge_type = g.charge_type and g.is_del='1'\n" +
                    " LEFT JOIN wlyy_charge_dict h ON t.xgsz_charge_type = h.charge_type and h.is_del='1'\n" +
                    "WHERE t.id = '"+doctorDO.getId()+"' ";
            chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            //System.out.println(chargeDictDOLists.get(1));

common/common-entity/sql/sql记录

@@ -2430,3 +2430,9 @@ alter table wlyy_outpatient add column is_positive tinyint(1) DEFAULT NULL comme
-- 2022-12-27 ysj wlyy_specialist
alter table wlyy_patient_rehabilitation_plan add column patient_info_code varchar(50) DEFAULT NULL COMMENT '自动下转关联code';
alter table wlyy_patient_rehabilitation_plan add column third_org_code varchar(50) DEFAULT NULL COMMENT '自动下转的医院code';
-- 2023-01-29 wzn base
alter table base_doctor add column xgsz_charge_type varchar(50) DEFAULT NULL COMMENT '新冠首诊号别';
alter table wlyy_outpatient add column visit_type varchar(2) DEFAULT NULL COMMENT '就诊类型：1首诊2复诊';
alter table wlyy_outpatient add column virus_flag varchar(2) DEFAULT NULL COMMENT '新冠病毒：1阴性、2阳性、0无';
alter table wlyy_charge_dict add column code varchar(50) DEFAULT NULL COMMENT '号别编码';

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

@@ -282,6 +282,11 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
     */
    private String jyzxChargeType;
    /**
     * 新冠首诊
     */
    private String xgszChargeType;
    private String visitTime;
    /**
@@ -312,6 +317,15 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    private String ztId;//禅道用户id
    public String getXgszChargeType() {
        return xgszChargeType;
    }
    public void setXgszChargeType(String xgszChargeType) {
        this.xgszChargeType = xgszChargeType;
    }
    public String getZtId() {
        return ztId;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/WlyyChargeDictDO.java

@@ -12,7 +12,12 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_charge_dict")
public class WlyyChargeDictDO extends UuidIdentityEntity {
    /**
     * 号别编码
     */
    private String code;
    /**号别code*/
    private String chargeType;
    /**号别名称*/
    private String chargeName;
@@ -24,6 +29,15 @@ public class WlyyChargeDictDO extends UuidIdentityEntity {
    private String deptTypeCode;
    private String isDel;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getIsDel() {
        return isDel;
    }

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

@@ -308,6 +308,26 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    private String inquirySign;//问诊标识1发热咨询0普通门诊
    private String visitType;//就诊类型：1首诊2复诊
    private String virusFlag;//新冠病毒：1阴性、2阳性、0无
    @Column(name = "visit_type")
    public String getVisitType() {
        return visitType;
    }
    public void setVisitType(String visitType) {
        this.visitType = visitType;
    }
    @Column(name = "virus_flag")
    public String getVirusFlag() {
        return virusFlag;
    }
    public void setVirusFlag(String virusFlag) {
        this.virusFlag = virusFlag;
    }
    @Column(name = "inquiry_sign")
    public String getInquirySign() {
        return inquirySign;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorServiceEndPoint.java

@@ -37,6 +37,10 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "hospital", required = false) String hospital,
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "chargeType", value = "挂号类别")
            @RequestParam(value = "chargeType", required = false) String chargeType,
            @ApiParam(name = "conditionKey", value = "搜索条件（姓名、手机号、身份证）")
            @RequestParam(value = "conditionKey", required = false) String conditionKey,
            @ApiParam(name = "name", value = "科室或医生名称")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "type", value = "咨询类型")
@@ -50,7 +54,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "pageSize", value = "页码", required = true, defaultValue = "10")
            @RequestParam(value = "pageSize") int pageSize) throws Exception {
        try {
            return baseDoctorService.queryList(city,hospital,status,name,type,typeCode,dept,page,pageSize);
            return baseDoctorService.queryList(city,hospital,status,chargeType,conditionKey,name,type,typeCode,dept,page,pageSize);
        }catch (Exception e){
            return failedException2(e);
        }

svr/svr-internet-hospital/pom.xml

@@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital</artifactId>
    <artifactId>svr-internet-hospital-test</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@@ -267,7 +267,7 @@
    </dependencies>
    <build>
        <finalName>svr-internet-hospital</finalName>
        <finalName>svr-internet-hospital-test</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/config/DoctorServiceEndPoint.java

@@ -36,6 +36,10 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "hospital", required = false) String hospital,
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "chargeType", value = "挂号类别")
            @RequestParam(value = "chargeType", required = false) String chargeType,
            @ApiParam(name = "conditionKey", value = "搜索条件（姓名、手机号、身份证）")
            @RequestParam(value = "conditionKey", required = false) String conditionKey,
            @ApiParam(name = "name", value = "科室或医生名称")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "type", value = "咨询类型")
@@ -50,7 +54,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "pageSize") int pageSize) throws Exception {
        try{
            return baseDoctorService.queryList(city,hospital,status,name,type,typeCode,dept,page,pageSize);
            return baseDoctorService.queryList(city,hospital,status,chargeType,conditionKey,name,type,typeCode,dept,page,pageSize);
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-internet-hospital
    name:  svr-internet-hospital-wangzhinan
  cloud:
    config:
      failFast: true