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/wechat/WechatMenuController.java

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

@@ -39,4 +39,10 @@ public interface BaseDoctorDao extends PagingAndSortingRepository<BaseDoctorDO,
    void updateStatus(String doctorId,String status);
    List<BaseDoctorDO> findByIdcard(String idcard);
    @Query("from BaseDoctorDO d where d.yktDoctorId = ?1 AND d.del ='1'")
    BaseDoctorDO findByYktDoctorId(String yktDoctorId);
    @Query("from BaseDoctorDO d where d.idcard = ?1 AND d.del ='1'")
    BaseDoctorDO findByIdcardAndId(String idcard);
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.hospital.dict;
import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import javax.transaction.Transactional;
@@ -18,4 +19,7 @@ public interface WlyyChargeDictDao extends PagingAndSortingRepository<WlyyCharge
    WlyyChargeDictDO  findByChargeTypeAndDeptTypeCode(String chargeType,String deptTypeCode);
    WlyyChargeDictDO  findByChargeType(String chargeType);
    @Query("from WlyyChargeDictDO d where d.reqFee = ?1 ")
    WlyyChargeDictDO  findByReqFee(Double reqFee);
}

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

@@ -868,9 +868,25 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        WlyyOutpatientDO outpatient = outpatientDao.save(outpatientDO);
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("WX_MONEY");
        Double price = 0.0;
        String chargeType1 = 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();
            }
        }else if (outpatient.getOutpatientType().equalsIgnoreCase("2")){
            chargeType1 = doctorDO.getXtfzChargeType();
        }
        if(doctorDO!=null){
            if (StringUtils.isNoneBlank(doctorDO.getChargeType())){
                WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByChargeType(doctorDO.getChargeType());
            if (StringUtils.isNoneBlank(chargeType1)){
                WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByChargeType(chargeType1);
                if (chargeDictDO!=null){
                    price = chargeDictDO.getReqFee();
                }else {
@@ -1472,7 +1488,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " h.dept_code AS \"deptCode\"," +
                " h.dept_Name AS \"deptName\"," +
                " d.outpatient_type AS \"outpatientType\"," +
                " d.consult_status AS \"consultStatus\"" +
                " d.consult_status AS \"consultStatus\"," +
                " d.twfz_charge_type AS \"twfzConsultStatus\"," +
                " d.spfz_charge_type AS \"spfzConsultStatus\"," +
                " d.twzx_charge_type AS \"twzxConsultStatus\"," +
                " d.spzx_charge_type AS \"spzxConsultStatus\"," +
                " d.xtfz_charge_type AS \"xtfzConsultStatus\" " +
                " FROM " +
                " base_doctor d " +
                " JOIN base_doctor_hospital h ON h.doctor_code = d.id " +
@@ -1558,7 +1579,22 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
                List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
                if (null!=doctor.get("chargeType")){
                String sqlCharge = "SELECT\n" +
                        "\tm.req_fee as \"twfzFee\",\n" +
                        "\ta.req_fee as \"spfzFee\",\n" +
                        "\tb.req_fee as \"spzxFee\",\n" +
                        "\tv.req_fee as \"twzxFee\",\n" +
                        "\td.req_fee as \"xtzxFee\"\n" +
                        "FROM\n" +
                        "\tbase_doctor t\n" +
                        "LEFT JOIN wlyy_charge_dict m ON t.twfz_charge_type = m.charge_type\n" +
                        "LEFT JOIN wlyy_charge_dict a ON t.spfz_charge_type = a.charge_type\n" +
                        "LEFT JOIN wlyy_charge_dict b ON t.spzx_charge_type = b.charge_type\n" +
                        "LEFT JOIN wlyy_charge_dict v ON t.twzx_charge_type = v.charge_type\n" +
                        "LEFT JOIN wlyy_charge_dict d ON t.xtfz_charge_type = d.charge_type\n" +
                        "WHERE t.id = '"+doctor.get("id")+"' ";
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
                /*if (null!=doctor.get("chargeType")){
                    String chargeTypeList = doctor.get("chargeType").toString();
                    if (chargeType.contains(",")){
                        chargeTypeList = chargeType.replace(",","','");
@@ -1567,11 +1603,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                            " from wlyy_charge_dict where 1=1";
                    sqlCharge+=" and charge_type in ( '"+chargeTypeList+"')";
                    if (StringUtils.isNoneBlank(deptTyepCode)){
                        sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                    }
                    chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
                }
                }*/
                doctor.put("chargeTypeList",chargeDictDOLists);
            }
            if (StringUtils.isNotBlank(doctorCode)) {
@@ -2840,7 +2877,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     */
    public MixEnvelop findExpressageList(String status, String oneselfPickupFlg, String nameKey, String startTime, String endTime, Integer page, Integer size, String wxId) {
        String totalSql = "SELECT " +
                " COUNT(1) AS total " +
                " COUNT(1) AS \"total\" " +
                " FROM " +
                " wlyy_outpatient o " +
                " JOIN wlyy_prescription p ON p.outpatient_id = o.id " +
@@ -3474,7 +3511,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String chargeType = doctorDO.getChargeType();
            /*String chargeType = doctorDO.getChargeType();
            if (StringUtils.isNotBlank(chargeType)){
                if (chargeType.contains(",")){
                    chargeType = chargeType.replace(",","','");
@@ -3487,7 +3524,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                }
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            }
            }*/
            rs.put("chargeTypeList",chargeDictDOLists);
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
@@ -3740,7 +3777,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            /*List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String chargeType = doctorDO.getChargeType();
            if (StringUtils.isNotBlank(chargeType)){
                if (chargeType.contains(",")){
@@ -3755,7 +3792,23 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            }
            rs.put("chargeTypeList",chargeDictDOLists);
            rs.put("chargeTypeList",chargeDictDOLists);*/
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String sqlCharge = "SELECT\n" +
                    "\tm.req_fee as \"twfzFee\",\n" +
                    "\ta.req_fee as \"spfzFee\",\n" +
                    "\tb.req_fee as \"spzxFee\",\n" +
                    "\tv.req_fee as \"twzxFee\",\n" +
                    "\td.req_fee as \"xtzxFee\"\n" +
                    "FROM\n" +
                    "\tbase_doctor t\n" +
                    "LEFT JOIN wlyy_charge_dict m ON t.twfz_charge_type = m.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict a ON t.spfz_charge_type = a.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict b ON t.spzx_charge_type = b.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict v ON t.twzx_charge_type = v.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict d ON t.xtfz_charge_type = d.charge_type\n" +
                    "WHERE t.id = '"+doctorDO.getId()+"' ";
            chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
            List<BaseDoctorHospitalDO> hospitalDOList = new ArrayList<>();
@@ -5224,7 +5277,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            /*List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            if(null!=map.get("chargeType")){
                String chargeType = map.get("chargeType").toString();
                if (chargeType.contains(",")){
@@ -5239,7 +5292,23 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            }
            map.put("chargeTypeList",chargeDictDOLists);
            map.put("chargeTypeList",chargeDictDOLists);*/
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String sqlCharge = "SELECT\n" +
                    "\tm.req_fee as \"twfzFee\",\n" +
                    "\ta.req_fee as \"spfzFee\",\n" +
                    "\tb.req_fee as \"spzxFee\",\n" +
                    "\tv.req_fee as \"twzxFee\",\n" +
                    "\td.req_fee as \"xtzxFee\"\n" +
                    "FROM\n" +
                    "\tbase_doctor t\n" +
                    "LEFT JOIN wlyy_charge_dict m ON t.twfz_charge_type = m.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict a ON t.spfz_charge_type = a.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict b ON t.spzx_charge_type = b.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict v ON t.twzx_charge_type = v.charge_type\n" +
                    "LEFT JOIN wlyy_charge_dict d ON t.xtfz_charge_type = d.charge_type\n" +
                    "WHERE t.id = '"+map.get("id")+"' ";
            chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            //查询医生各项评价平均分
            String sqlscore = "SELECT " +
                    "AVG(a.score) AS \"score\"," +
@@ -8730,7 +8799,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (prescriptionDO == null) {
            throw new Exception("处方不存在！");
        }
        List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wxId, prescriptionDO.getPatientCode());
        WlyyOutpatientDO outpatientDO = outpatientDao.findById(oupatientId);
        List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wxId, outpatientDO.getConsumer());
        if (patientWechatDos == null || patientWechatDos.size() == 0) {
            throw new Exception("openid不存在！");
        }
@@ -9170,4 +9240,121 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }
    /**
     *
     * @param price
     * @param type
     * @param flag
     * @return
     */
    public String synYktZxPrice(String idcard,Integer price,Integer type,String flag) throws Exception {
        if (StringUtils.isNoneBlank(flag)){
            List<BaseDoctorDO> doctorDOList = baseDoctorDao.findByDel();
            for (BaseDoctorDO doctorDO:doctorDOList){
                String yktDoctor = null;
                DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctorDO.getId());
                String doctorResponse = ykyyService.getYktDoctor(doctorMappingDO.getMappingCode());
                com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(doctorResponse);
                if (jsonObject.getInteger("code")==200){
                    com.alibaba.fastjson.JSONArray array1 = jsonObject.getJSONArray("data");
                    if (array1!=null&&array1.size()!=0){
                        yktDoctor=array1.getJSONObject(0).getString("DOCTORUSERID");
                    }
                }
                if (StringUtils.isNoneBlank(yktDoctor)){
                    doctorDO.setYktDoctorId(yktDoctor);
                    //图文
                    String twResponse =ykyyService.GetVasPriceByTypeForJkzl(yktDoctor,1);
                    com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(twResponse);
                    if (object.getInteger("code")==10000){
                        if (object.containsKey("value")){
                            com.alibaba.fastjson.JSONObject object1 = object.getJSONObject("value");
                            Integer twPrcie=object1.getInteger("price");
                            Double twPrcie1 = Double.parseDouble(twPrcie+"");
                            WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByReqFee(twPrcie1);
                            if (chargeDictDO!=null){
                                chargeDictDO = new WlyyChargeDictDO();
                                chargeDictDO.setCreateTime(new Date());
                                chargeDictDO.setReqFee(twPrcie1);
                                chargeDictDO.setChargeType(twPrcie+"");
                                chargeDictDO.setChargeName(twPrcie+"");
                                chargeDictDO = wlyyChargeDictDao.save(chargeDictDO);
                            }
                            doctorDO.setTwzxChargeType(chargeDictDO.getChargeType());
                        }
                    }
                    //视频
                    String spResponse =ykyyService.GetVasPriceByTypeForJkzl(yktDoctor,3);
                    com.alibaba.fastjson.JSONObject jsonObject1 = com.alibaba.fastjson.JSONObject.parseObject(spResponse);
                    if (jsonObject1.getInteger("code")==10000){
                        if (jsonObject1.containsKey("value")){
                            com.alibaba.fastjson.JSONObject object1 = jsonObject1.getJSONObject("value");
                            Integer spPrcie=object1.getInteger("price");
                            Double spPrcie1 = Double.parseDouble(spPrcie+"");
                            WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByReqFee(spPrcie1);
                            if (chargeDictDO==null){
                                chargeDictDO = new WlyyChargeDictDO();
                                chargeDictDO.setCreateTime(new Date());
                                chargeDictDO.setReqFee(spPrcie1);
                                chargeDictDO.setChargeType(spPrcie+"");
                                chargeDictDO.setChargeName(spPrcie+"");
                                chargeDictDO = wlyyChargeDictDao.save(chargeDictDO);
                            }
                            doctorDO.setSpzxChargeType(chargeDictDO.getChargeType());
                        }
                    }
                }
                baseDoctorDao.save(doctorDO);
            }
            return "ok";
        }else {
            BaseDoctorDO doctorDO = baseDoctorDao.findByIdcardAndId(idcard);
            if (doctorDO!=null){
                if (!StringUtils.isNoneBlank(doctorDO.getYktDoctorId())){
                    String yktDoctor = null;
                    DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctorDO.getId());
                    String doctorResponse = ykyyService.getYktDoctor(doctorMappingDO.getMappingCode());
                    com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(doctorResponse);
                    if (jsonObject.getInteger("code")==200){
                        com.alibaba.fastjson.JSONArray array1 = jsonObject.getJSONArray("data");
                        if (array1!=null&&array1.size()!=0){
                            yktDoctor=array1.getJSONObject(0).getString("DOCTORUSERID");
                        }
                    }
                    doctorDO.setYktDoctorId(yktDoctor);
                }
                if (type!=null&&type==1) {
                    Double price1 = Double.parseDouble(price + "");
                    WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByReqFee(price1);
                    if (chargeDictDO == null) {
                        chargeDictDO = new WlyyChargeDictDO();
                        chargeDictDO.setCreateTime(new Date());
                        chargeDictDO.setReqFee(price1);
                        chargeDictDO.setChargeType(price + "");
                        chargeDictDO.setChargeName(price + "");
                        chargeDictDO = wlyyChargeDictDao.save(chargeDictDO);
                    }
                    doctorDO.setTwzxChargeType(chargeDictDO.getChargeType());
                }else if (type!=null&&type==3) {
                    Double price1 = Double.parseDouble(price + "");
                    WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByReqFee(price1);
                    if (chargeDictDO == null) {
                        chargeDictDO = new WlyyChargeDictDO();
                        chargeDictDO.setCreateTime(new Date());
                        chargeDictDO.setReqFee(price1);
                        chargeDictDO.setChargeType(price + "");
                        chargeDictDO.setChargeName(price + "");
                        chargeDictDO = wlyyChargeDictDao.save(chargeDictDO);
                    }
                    doctorDO.setSpzxChargeType(chargeDictDO.getChargeType());
                }
                baseDoctorDao.save(doctorDO);
                return "ok";
            }else {
                return "找不到医生信息！";
            }
        }
        return null;
    }
}

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

@@ -359,9 +359,25 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        }
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("WX_MONEY");
        Double price = 0.0;
        String chargeType1 = 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();
            }
        }else if (outpatient.getOutpatientType().equalsIgnoreCase("2")){
            chargeType1 = doctorDO.getXtfzChargeType();
        }
        if(doctorDO!=null){
            if (StringUtils.isNoneBlank(doctorDO.getChargeType())){
                WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByChargeType(doctorDO.getChargeType());
                WlyyChargeDictDO chargeDictDO = wlyyChargeDictDao.findByChargeType(chargeType1);
                if (chargeDictDO!=null){
                    price = chargeDictDO.getReqFee();
                }else {

business/base-service/src/main/java/com/yihu/jw/hospital/ykyy/service/YkyyService.java

@@ -317,6 +317,21 @@ public class YkyyService {
    }
    /**
     * 查询医生咨询价格
     * @param doctorId
     * @param type
     * @return
     */
    public String GetVasPriceByTypeForJkzl(String doctorId,int type){
        String response="";
        String url = yktUrl_90+"api/Share/GetVasPriceByTypeForJkzl?doctorId="+doctorId+"&type="+type;
        response = httpClientUtil.get(url,"GBK");
        logger.info("获取服务价格:"+response);
        return response;
    }
    /**
     *获取家庭成员信息
     *

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -1,6 +1,5 @@
package com.yihu.jw.entity;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
@@ -19,13 +18,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    @GeneratedValue(generator = "generator")
 /*   @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    @Column(name = "id", unique = true, nullable = false)*/
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
/*   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

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

@@ -256,6 +256,27 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
     *眼科同医生id
     */
    private String yktDoctorId;
    /**
     * 图文复诊号别
     */
    private String twfzChargeType;
    /**
     * 视频复诊号别
     */
    private String spfzChargeType;
    /**
     * 图文咨询号别
     */
    private String twzxChargeType;
    /**
     * 视频咨询号别
     */
    private String spzxChargeType;
    /**
     * 协同复诊号别
     */
    private String xtfzChargeType;
    @Column(name = "YKT_DOCTOR_ID")
    public String getYktDoctorId() {
        return yktDoctorId;
@@ -657,4 +678,50 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    public void setCaFlag(Integer caFlag) {
        this.caFlag = caFlag;
    }
    @Column(name = "twfz_charge_type")
    public String getTwfzChargeType() {
        return twfzChargeType;
    }
    public void setTwfzChargeType(String twfzChargeType) {
        this.twfzChargeType = twfzChargeType;
    }
    @Column(name = "spfz_charge_type")
    public String getSpfzChargeType() {
        return spfzChargeType;
    }
    public void setSpfzChargeType(String spfzChargeType) {
        this.spfzChargeType = spfzChargeType;
    }
    @Column(name = "twzx_charge_type")
    public String getTwzxChargeType() {
        return twzxChargeType;
    }
    public void setTwzxChargeType(String twzxChargeType) {
        this.twzxChargeType = twzxChargeType;
    }
    @Column(name = "spzx_charge_type")
    public String getSpzxChargeType() {
        return spzxChargeType;
    }
    public void setSpzxChargeType(String spzxChargeType) {
        this.spzxChargeType = spzxChargeType;
    }
    @Column(name = "xtfz_charge_type")
    public String getXtfzChargeType() {
        return xtfzChargeType;
    }
    public void setXtfzChargeType(String xtfzChargeType) {
        this.xtfzChargeType = xtfzChargeType;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1407,6 +1407,7 @@ public class BaseHospitalRequestMapping {
        public static final String savePrivateDict = "/savePrivateDict";
        public static final String delPrivateDict = "/delPrivateDict";
        public static final String findHospitalInfo = "/findHospitalInfo";
        public static final String synYktZxPrice = "/synYktZxPrice";
    }
    /**

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/doctor/BaseDoctorVO.java

@@ -196,6 +196,32 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty("医生归属科室")
    private List<String> department;
    /**
     * 图文复诊号别
     */
    @ApiModelProperty("图文复诊号别")
    private String twfzChargeType;
    /**
     * 视频复诊号别
     */
    @ApiModelProperty("视频复诊号别")
    private String spfzChargeType;
    /**
     * 图文咨询号别
     */
    @ApiModelProperty("图文咨询号别")
    private String twzxChargeType;
    /**
     * 视频咨询号别
     */
    @ApiModelProperty("视频咨询号别")
    private String spzxChargeType;
    /**
     * 协同复诊号别
     */
    @ApiModelProperty("协同复诊号别")
    private String xtfzChargeType;
    /**
     * 上线下线状态
     */
@@ -424,4 +450,44 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
    public void setOnline(String online) {
        this.online = online;
    }
    public String getTwfzChargeType() {
        return twfzChargeType;
    }
    public void setTwfzChargeType(String twfzChargeType) {
        this.twfzChargeType = twfzChargeType;
    }
    public String getSpfzChargeType() {
        return spfzChargeType;
    }
    public void setSpfzChargeType(String spfzChargeType) {
        this.spfzChargeType = spfzChargeType;
    }
    public String getTwzxChargeType() {
        return twzxChargeType;
    }
    public void setTwzxChargeType(String twzxChargeType) {
        this.twzxChargeType = twzxChargeType;
    }
    public String getSpzxChargeType() {
        return spzxChargeType;
    }
    public void setSpzxChargeType(String spzxChargeType) {
        this.spzxChargeType = spzxChargeType;
    }
    public String getXtfzChargeType() {
        return xtfzChargeType;
    }
    public void setXtfzChargeType(String xtfzChargeType) {
        this.xtfzChargeType = xtfzChargeType;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -1127,4 +1127,22 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(object);
    }
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.synYktZxPrice)
    @ApiOperation(value = "同步眼科通医生价格", notes = "同步眼科通医生价格")
    public ObjEnvelop synYktZxPrice(@ApiParam(name = "doctorId", value = "医生id")
                                         @RequestParam(value = "doctorId", required = false)String doctorId,
                                         @ApiParam(name = "price", value = "价格")
                                         @RequestParam(value = "price", required = false)Integer price,
                                    @ApiParam(name = "type", value = "类型")
                                        @RequestParam(value = "type", required = false)Integer type,
                                    @ApiParam(name = "flag", value = "同步所有医生价格")
                                        @RequestParam(value = "flag", required = false)String flag) throws Exception{
        String object = prescriptionService.synYktZxPrice(doctorId,price,type,flag);
        ObjEnvelop objEnvelop = new ObjEnvelop();
        objEnvelop.setMessage(object);
        objEnvelop.setStatus(200);
        return success(objEnvelop);
    }
}

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

@@ -216,7 +216,7 @@ es:
    Statistics: hlw_quota_test
  type:
    Statistics: hlw_quota_test
  host:  http://172.26.0.55:9200
  host:  http://172.26.0.55:9000
  tHost: 172.26.0.55:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr