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

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

@@ -101,10 +101,15 @@ public class YkyyEntranceService {
    @Autowired
    private BaseEvaluateDao baseEvaluateDao;
    public List<Map<String, Object>> createSQLQuery(String sql, Map<String, Object> params, Integer page, Integer size){
        return hibenateUtils.createSQLQuery(sql,params,page,size);
    }
    public void save(Object object){
        hibenateUtils.save(object);
    }
    /**
     * 同步科室信息
     * @return

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

@@ -1,12 +1,17 @@
package com.yihu.jw.hospital.ykyy.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.idcard.IdCardUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.charts.LineChartSeries;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -196,4 +201,182 @@ public class YkyyService {
        return response;
    }
    /**
     * 增加家庭成员
     * @param userId
     * @param idcard
     * @param name
     * @param sex
     * @param birth
     * @param age
     * @param tel
     * @return
     */
    public String addFamily(String userId,String idcard,String name,String sex,String birth,String age,String tel){
        String response="";
        String url = yktUrl+"doc_jkzl/add_family?ass_user_id="+userId+"&id_card="+idcard+"&name="+name+"&sex="+sex
                +"&birth="+birth+"&age="+age+"&tel="+tel+"&medical_card=&illness=本人&clinic_id=";
        response = httpClientUtil.get(url,"GBK");
        return response;
    }
    /**
     *获取家庭成员信息
     *
     * @param tel
     * @param userId
     * @return
     */
    public String getFamilyList(String tel,String userId){
        String response="";
        String url = yktUrl+"doc_jkzl/get_family_list?";
        if (StringUtils.isNoneBlank(tel)&&StringUtils.isNoneBlank(userId)){
            url+="tel="+tel;
            url+="&user_id="+userId;
        }else if (StringUtils.isNoneBlank(tel)&&!StringUtils.isNoneBlank(userId)){
            url+="tel="+tel;
        }else if (!StringUtils.isNoneBlank(tel)&&StringUtils.isNoneBlank(userId)){
            url+="user_id="+userId;
        }
        response = httpClientUtil.get(url,"GBK");
        return response;
    }
    /**
     * 同步眼科通数据
     * @param patient
     * @return
     * @throws Exception
     */
    public void registerYkt(String patient) throws Exception {
        BasePatientDO basePatientDO  = patientDao.findById(patient);
        if (basePatientDO!=null){
            String userId = basePatientDO.getUserId();
            if (StringUtils.isNoneBlank(userId)){
                String familyList =getFamilyList(null,userId);
                JSONObject object = JSONObject.parseObject(familyList);
                if (object.getString("code").equalsIgnoreCase("200")){
                    JSONObject object1 = object.getJSONObject("data");
                    JSONArray array = object1.getJSONArray("list");
                    if (array!=null&&array.size()!=0){
                        JSONObject jsonObject = array.getJSONObject(0);
                        if (jsonObject!=null){
                            String yktId = jsonObject.getString("ID");
                            basePatientDO.setYktId(yktId);
                            patientDao.save(basePatientDO);
                        }
                    }else {
                        String birdth = IdCardUtil.getBirthdayForIdcardStr(basePatientDO.getIdcard());
                        Integer age = IdCardUtil.getAgeForIdcard(basePatientDO.getIdcard());
                        Integer sex = basePatientDO.getSex();
                        String family = addFamily(userId,basePatientDO.getIdcard(),basePatientDO.getName(),sex.toString(),birdth,age.toString(),basePatientDO.getMobile());
                        JSONObject object2 = JSONObject.parseObject(family);
                        if (object2.getString("code").equalsIgnoreCase("200")){
                            JSONObject object3 = object2.getJSONObject("data");
                            String yktId = object3.getString("ID");
                            basePatientDO.setYktId(yktId);
                            patientDao.save(basePatientDO);
                        }
                    }
                }else {
                    throw new Exception("查询家庭成员失败！");
                }
            }else {
                String response1 = getShortMessage("1",basePatientDO.getMobile());
                JSONObject jsonObject = JSONObject.parseObject(response1);
                if (jsonObject.getString("code").equalsIgnoreCase("10000")){
                    String code = jsonObject.getString("value");
                    String r =getRegisterUser(basePatientDO.getMobile(),"123456",code,"a01522","xmijk","xmijk");
                    JSONObject object4 = JSONObject.parseObject(r);
                    if (object4.getString("code").equalsIgnoreCase("200")){
                        JSONObject object5 = object4.getJSONObject("data");
                        if (object5!=null){
                            userId = object5.getString("ID");
                            basePatientDO.setUserId(userId);
                            patientDao.save(basePatientDO);
                            String familyList =getFamilyList(null,userId);
                            JSONObject object = JSONObject.parseObject(familyList);
                            if (object.getString("code").equalsIgnoreCase("200")){
                                JSONObject object1 = object.getJSONObject("data");
                                JSONArray array = object1.getJSONArray("list");
                                if (array!=null&&array.size()!=0){
                                    JSONObject jsonObject1 = array.getJSONObject(0);
                                    if (jsonObject1!=null){
                                        String yktId = jsonObject1.getString("ID");
                                        userId = jsonObject1.getString("ASSUSERID");
                                        basePatientDO.setYktId(yktId);
                                        basePatientDO.setUserId(userId);
                                        patientDao.save(basePatientDO);
                                    }
                                }else {
                                    String birdth = IdCardUtil.getBirthdayForIdcardStr(basePatientDO.getIdcard());
                                    Integer age = IdCardUtil.getAgeForIdcard(basePatientDO.getIdcard());
                                    Integer sex = basePatientDO.getSex();
                                    String family = addFamily(userId,basePatientDO.getIdcard(),basePatientDO.getName(),sex.toString(),birdth,age.toString(),basePatientDO.getMobile());
                                    JSONObject object2 = JSONObject.parseObject(family);
                                    if (object2.getString("code").equalsIgnoreCase("200")){
                                        JSONObject object3 = object2.getJSONObject("data");
                                        String yktId = object3.getString("ID");
                                        basePatientDO.setYktId(yktId);
                                        userId = object3.getString("ASSUSERID");
                                        basePatientDO.setUserId(userId);
                                        patientDao.save(basePatientDO);
                                    }
                                }
                            }else {
                                throw new Exception("查询家庭成员失败！");
                            }
                        }
                    }else {
                        throw new Exception("用户注册失败");
                    }
                }else if (jsonObject.getString("code").equalsIgnoreCase("199")){
                    String familyList =getFamilyList(basePatientDO.getMobile(),null);
                    JSONObject object = JSONObject.parseObject(familyList);
                    if (object.getString("code").equalsIgnoreCase("200")){
                        JSONObject object1 = object.getJSONObject("data");
                        JSONArray array = object1.getJSONArray("list");
                        if (array!=null&&array.size()!=0){
                            JSONObject jsonObject1 = array.getJSONObject(0);
                            if (jsonObject1!=null){
                                String yktId = jsonObject1.getString("ID");
                                userId = jsonObject1.getString("ASSUSERID");
                                basePatientDO.setYktId(yktId);
                                basePatientDO.setUserId(userId);
                                patientDao.save(basePatientDO);
                            }
                        }else {
                            userId=object1.getString("user_id");
                            String birdth = DateUtil.dateToStrShort(IdCardUtil.getBirthdayForIdcard(basePatientDO.getIdcard()));
                            Integer age = IdCardUtil.getAgeForIdcard(basePatientDO.getIdcard());
                            Integer sex = basePatientDO.getSex();
                            String family = addFamily(userId,basePatientDO.getIdcard(),basePatientDO.getName(),sex.toString(),birdth,age.toString(),basePatientDO.getMobile());
                            JSONObject object2 = JSONObject.parseObject(family);
                            if (object2.getString("code").equalsIgnoreCase("200")){
                                JSONObject object3 = object2.getJSONObject("data");
                                String yktId = object3.getString("ID");
                                basePatientDO.setYktId(yktId);
                                userId = object3.getString("ASSUSERID");
                                basePatientDO.setUserId(userId);
                                patientDao.save(basePatientDO);
                            }
                        }
                    }else {
                        throw new Exception("查询家庭成员失败！");
                    }
                }else {
                    throw new Exception("获取验证码失败");
                }
            }
        }
    }
}

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

@@ -6,9 +6,11 @@ import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.WxPayLogDO;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.order.BusinessOrderRefundDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.order.dao.BusinessOrderDao;
@@ -21,6 +23,7 @@ import com.yihu.jw.rm.patient.PatientRequestMapping;
import com.yihu.jw.util.common.XMLUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.wechat.WeiXinPayUtils;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
@@ -29,6 +32,7 @@ import com.yihu.jw.wechat.service.WxPayLogService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -61,6 +65,8 @@ public class BusinessOrderService {
    private YkyyService ykyyService;
    @Autowired
    private DoctorMappingDao doctorMappingDao;
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    /**
@@ -77,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();
@@ -99,6 +105,7 @@ public class BusinessOrderService {
     * @return
     * @throws Exception
     */
    @Transactional(rollbackFor = Exception.class)
    public Map<String, Object> saveOrderAndPay(BusinessOrderDO businessOrderDO,String wechatId) throws Exception {
        businessOrderDO.setStatus(0);
        businessOrderDO.setCreateTime(new Date());
@@ -114,13 +121,10 @@ public class BusinessOrderService {
        if(wxWechatDO==null){
            throw new Exception("can't find wechat:the wxId is "+wechatId);
        }
        String url = wxWechatDO.getBaseUrl();
        String notifyUrl =url+"/ykyy"+BaseHospitalRequestMapping.WxPay.Notify;
        Map<String,Object> map = unifiedorder(wechatId,businessOrderDO.getDescription(),businessOrderDO.getPayPrice().toString(),WeChatConfig.TRADE_TYPE_JSAPI,openId,businessOrderDO.getOrderNo(),notifyUrl);
        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();
@@ -131,7 +135,14 @@ public class BusinessOrderService {
        String orderCatagrate = businessOrderDO.getOrderCategory();
        String pcCallBack=businessOrderDO.getPcCallbackUrl();
        String appCallBack = businessOrderDO.getAppCallbackUrl();
        ykyyService.addYktOrder(orderNo,patientId,orderAmout,description,state,orderType,doctorMappingDO.getMappingCode(),payType,null,patientTel,orderCatagrate,pcCallBack,appCallBack);
        String url = wxWechatDO.getBaseUrl();
        String notifyUrl =url+"/ykyy"+BaseHospitalRequestMapping.WxPay.Notify;
        Map<String,Object> map = unifiedorder(wechatId,description,businessOrderDO.getPayPrice().toString(),WeChatConfig.TRADE_TYPE_JSAPI,openId,orderNo,notifyUrl);
        String doctorId = "";
        if (doctorMappingDO!=null){
            doctorId = doctorMappingDO.getMappingCode();
        }
        ykyyService.addYktOrder(orderNo,patientId,orderAmout,description,state,orderType,doctorId,payType,null,patientTel,orderCatagrate,pcCallBack,appCallBack);
        return map;
    }
@@ -165,6 +176,32 @@ public class BusinessOrderService {
        return map;
    }
    public Map<String,Object> selectOrderByRelationCode(String relationCode,String wechatId) throws Exception {
        WxWechatDO wxWechatDO = wechatDao.findById(wechatId);
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(relationCode);
        String body = businessOrderDO.getDescription();
        List<WlyyHospitalSysDictDO> hospitalSysDictDOS = hospitalSysDictDao.findByDictName("WX_MONEY");
        String totalFee = null;
        if (hospitalSysDictDOS!=null&&hospitalSysDictDOS.size()!=0){
            totalFee= hospitalSysDictDOS.get(0).getDictValue();
        }
        String patient = businessOrderDO.getPatient();
        String openid = "";
        if (StringUtils.isNoneBlank(patient)){
            List<BasePatientWechatDo> patientWechatDo = patientWechatDao.findByWechatIdAndPatientId(wechatId,patient);
            if (patientWechatDo!=null&&patientWechatDo.size()!=0){
                openid = patientWechatDo.get(0).getOpenid();
            }
        }
        String ourTradeNo = businessOrderDO.getOrderNo();
        String url = wxWechatDO.getBaseUrl();
        String notifyUrl =url+"/ykyy"+BaseHospitalRequestMapping.WxPay.Notify;
        Map<String,Object> map = unifiedorder(wechatId,body,totalFee,WeChatConfig.TRADE_TYPE_JSAPI,openid,ourTradeNo,notifyUrl);
        return map;
    }
    /**
     * 微信下单
     * @param wechatId
@@ -177,7 +214,8 @@ public class BusinessOrderService {
     * @return
     * @throws Exception
     */
    public Map<String,Object> unifiedorder(String wechatId,String body,String totalFee,String tradeType,String openId,String ourTradeNo,String notifyUrl) throws Exception {
    @Transactional(rollbackFor = Exception.class)
    public  Map<String,Object> unifiedorder(String wechatId,String body,String totalFee,String tradeType,String openId,String ourTradeNo,String notifyUrl) throws Exception {
        WxWechatDO wxWechatDO = wechatDao.findById(wechatId);
        if(wxWechatDO==null){
            throw new Exception("can't find wechat:the wxId is "+wechatId);
@@ -207,8 +245,21 @@ public class BusinessOrderService {
        map.put("notify_url",notifyUrl);
        map.put("trade_type", tradeType);
        map.put("openid", openId);
      /*  String token_url = "https://api.weixin.qq.com/cgi-bin/token";
        String params = "grant_type=client_credential&appid=" + wxWechatDO.getAppId() + "&secret=" + wxWechatDO.getAppSecret();
        String result = HttpUtil.sendGet(token_url, params);
        JSONObject json = new JSONObject(result);
        if (json.has("access_token")) {
            String token = json.get("access_token").toString();
            String expires_in = json.get("expires_in").toString();
            String openidList_url = "https://api.weixin.qq.com/cgi-bin/user/get";
            String params1 ="access_token="+ token +"&next_openid=";
            String result1 = HttpUtil.sendGet(openidList_url, params1);
            JSONObject json1 = new JSONObject(result1);
        }*/
        Map<String, Object> pay = unifiedorder(map, wxWechatDO.getAppKey());
        String returnCode = pay.get("return_code").toString();
        if (returnCode.equalsIgnoreCase("SUCCESS")){
            String appid = pay.get("appid").toString();
            String mchId = pay.get("mch_id").toString();
@@ -406,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();

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

@@ -16,4 +16,8 @@ public interface BusinessOrderDao extends PagingAndSortingRepository<BusinessOrd
    @Query("from BusinessOrderDO w where w.orderNo = ?1 ")
    BusinessOrderDO selectByOrderNo(String orderNo);
    @Query("from BusinessOrderDO w where w.relationCode = ?1 ")
    BusinessOrderDO selectByRelationCode(String relationCode);
}

business/base-service/src/main/java/com/yihu/jw/utils/hibernate/HibenateUtils.java

@@ -95,6 +95,7 @@ public class HibenateUtils {
        return list;
    }
    /**
     * 创建SQL查询，根据配置，获取数据库方言
     * sql为原生sql语句，查询，Oracle不区分大小写，返回值需要驼峰命名，字段别名需要加 双引号
@@ -157,7 +158,7 @@ public class HibenateUtils {
    public void save(Object object) {
        Session session = (Session) entityManager.getDelegate();
        session.saveOrUpdate(object);
        session.save(object);
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -237,6 +237,8 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    private String userId;
    private String yktId;
    private String register;
    private String phone;
@@ -634,4 +636,13 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    public void setPhone(String phone) {
        this.phone = phone;
    }
    @Column(name = "ykt_id")
    public String getYktId() {
        return yktId;
    }
    public void setYktId(String yktId) {
        this.yktId = yktId;
    }
}

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

@@ -0,0 +1,561 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import javax.persistence.*;
import java.util.Date;
/**
 * 眼科处方表1数据
 *
 * */
//@ApiModel(value = "HlwCf01VO", description = "眼科处方表1数据")
@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;//
    @Basic
    @Id
    @Column(name = "CFSB")
    public Integer getCFSB() {
        return cFSB;
    }
    public void setCFSB(Integer cFSB) {
        this.cFSB = cFSB;
    }
    @Basic
    @Column(name = "CFHM")
    public String getCFHM() {
        return cFHM;
    }
    public void setCFHM(String cFHM) {
        this.cFHM = cFHM;
    }
    @Basic
    @Column(name = "FPHM")
    public String getFPHM() {
        return fPHM;
    }
    public void setFPHM(String fPHM) {
        this.fPHM = fPHM;
    }
    @Basic
    @Column(name = "MZXH")
    public Integer getMZXH() {
        return mZXH;
    }
    public void setMZXH(Integer mZXH) {
        this.mZXH = mZXH;
    }
    @Basic
    @Column(name = "CFLX")
    public Integer getCFLX() {
        return cFLX;
    }
    public void setCFLX(Integer cFLX) {
        this.cFLX = cFLX;
    }
    @Basic
    @Column(name = "BRID")
    public Integer getBRID() {
        return bRID;
    }
    public void setBRID(Integer bRID) {
        this.bRID = bRID;
    }
    @Basic
    @Column(name = "BRXM")
    public String getBRXM() {
        return 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;
    }
    public void setKFRQ(Date kFRQ) {
        this.kFRQ = kFRQ;
    }
    @Basic
    @Column(name = "CFTS")
    public Integer getCFTS() {
        return cFTS;
    }
    public void setCFTS(Integer cFTS) {
        this.cFTS = cFTS;
    }
    @Basic
    @Column(name = "KSDM")
    public Integer getKSDM() {
        return kSDM;
    }
    public void setKSDM(Integer kSDM) {
        this.kSDM = kSDM;
    }
    @Basic
    @Column(name = "YSDM")
    public String getYSDM() {
        return 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;
    }
    public void setFYRQ(Date fYRQ) {
        this.fYRQ = fYRQ;
    }
    @Basic
    @Column(name = "FYCK")
    public Integer getFYCK() {
        return fYCK;
    }
    public void setFYCK(Integer fYCK) {
        this.fYCK = fYCK;
    }
    @Basic
    @Column(name = "HJGH")
    public String getHJGH() {
        return hJGH;
    }
    public void setHJGH(String hJGH) {
        this.hJGH = hJGH;
    }
    @Basic
    @Column(name = "PYGH")
    public String getPYGH() {
        return pYGH;
    }
    public void setPYGH(String pYGH) {
        this.pYGH = pYGH;
    }
    @Basic
    @Column(name = "FYGH")
    public String getFYGH() {
        return fYGH;
    }
    public void setFYGH(String fYGH) {
        this.fYGH = fYGH;
    }
    @Basic
    @Column(name = "PYBZ")
    public Integer getPYBZ() {
        return pYBZ;
    }
    public void setPYBZ(Integer pYBZ) {
        this.pYBZ = pYBZ;
    }
    @Basic
    @Column(name = "FYBZ")
    public Integer getFYBZ() {
        return fYBZ;
    }
    public void setFYBZ(Integer fYBZ) {
        this.fYBZ = fYBZ;
    }
    @Basic
    @Column(name = "CFGL")
    public Integer getCFGL() {
        return cFGL;
    }
    public void setCFGL(Integer cFGL) {
        this.cFGL = cFGL;
    }
    @Basic
    @Column(name = "ZFPB")
    public Integer getZFPB() {
        return zFPB;
    }
    public void setZFPB(Integer zFPB) {
        this.zFPB = zFPB;
    }
    @Basic
    @Column(name = "DYBZ")
    public Integer getDYBZ() {
        return dYBZ;
    }
    public void setDYBZ(Integer dYBZ) {
        this.dYBZ = dYBZ;
    }
    @Basic
    @Column(name = "YFSB")
    public Integer getYFSB() {
        return yFSB;
    }
    public void setYFSB(Integer yFSB) {
        this.yFSB = yFSB;
    }
    @Basic
    @Column(name = "TSCF")
    public Integer getTSCF() {
        return tSCF;
    }
    public void setTSCF(Integer tSCF) {
        this.tSCF = tSCF;
    }
    @Basic
    @Column(name = "TSLX")
    public Integer getTSLX() {
        return tSLX;
    }
    public void setTSLX(Integer tSLX) {
        this.tSLX = tSLX;
    }
    @Basic
    @Column(name = "TYBZ")
    public Integer getTYBZ() {
        return tYBZ;
    }
    public void setTYBZ(Integer tYBZ) {
        this.tYBZ = tYBZ;
    }
    @Basic
    @Column(name = "CFBZ")
    public Integer getCFBZ() {
        return cFBZ;
    }
    public void setCFBZ(Integer cFBZ) {
        this.cFBZ = cFBZ;
    }
    @Basic
    @Column(name = "JZXH")
    public Integer getJZXH() {
        return jZXH;
    }
    public void setJZXH(Integer jZXH) {
        this.jZXH = jZXH;
    }
    @Basic
    @Column(name = "YXPB")
    public Integer getYXPB() {
        return yXPB;
    }
    public void setYXPB(Integer yXPB) {
        this.yXPB = yXPB;
    }
    @Basic
    @Column(name = "JZKH")
    public String getJZKH() {
        return jZKH;
    }
    public void setJZKH(String jZKH) {
        this.jZKH = jZKH;
    }
    @Basic
    @Column(name = "DJYBZ")
    public Integer getDJYBZ() {
        return 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;
    }
    public void setZFSJ(Date zFSJ) {
        this.zFSJ = zFSJ;
    }
    @Basic
    @Column(name = "HDGH")
    public String getHDGH() {
        return 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;
    }
    public void setHDRQ(Date hDRQ) {
        this.hDRQ = hDRQ;
    }
    @Basic
    @Column(name = "JMPB")
    public Integer getJMPB() {
        return jMPB;
    }
    public void setJMPB(Integer jMPB) {
        this.jMPB = jMPB;
    }
    @Basic
    @Column(name = "YJYY")
    public Integer getYJYY() {
        return yJYY;
    }
    public void setYJYY(Integer yJYY) {
        this.yJYY = yJYY;
    }
    @Basic
    @Column(name = "TSBZDM")
    public String getTSBZDM() {
        return tSBZDM;
    }
    public void setTSBZDM(String tSBZDM) {
        this.tSBZDM = tSBZDM;
    }
    @Basic
    @Column(name = "LSCFBZ")
    public Integer getLSCFBZ() {
        return lSCFBZ;
    }
    public void setLSCFBZ(Integer lSCFBZ) {
        this.lSCFBZ = lSCFBZ;
    }
    @Basic
    @Column(name = "TYGH")
    public String getTYGH() {
        return tYGH;
    }
    public void setTYGH(String tYGH) {
        this.tYGH = tYGH;
    }
    @Basic
    @Column(name = "ZJFLAG")
    public Integer getZJFLAG() {
        return zJFLAG;
    }
    public void setZJFLAG(Integer zJFLAG) {
        this.zJFLAG = zJFLAG;
    }
    @Basic
    @Column(name = "ZLXZ")
    public Integer getZLXZ() {
        return zLXZ;
    }
    public void setZLXZ(Integer zLXZ) {
        this.zLXZ = zLXZ;
    }
    @Basic
    @Column(name = "ZFGH")
    public String getZFGH() {
        return zFGH;
    }
    public void setZFGH(String zFGH) {
        this.zFGH = zFGH;
    }
    @Basic
    @Column(name = "BZ")
    public String getBZ() {
        return bZ;
    }
    public void setBZ(String bZ) {
        this.bZ = bZ;
    }
    @Basic
    @Column(name = "SCDDH")
    public String getSCDDH() {
        return sCDDH;
    }
    public void setSCDDH(String sCDDH) {
        this.sCDDH = sCDDH;
    }
    @Basic
    @Column(name = "SPZT")
    public Integer getSPZT() {
        return sPZT;
    }
    public void setSPZT(Integer sPZT) {
        this.sPZT = sPZT;
    }
    @Basic
    @Column(name = "DQPB")
    public Integer getDQPB() {
        return 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;
    }
    public void setSPRQ(Date sPRQ) {
        this.sPRQ = sPRQ;
    }
    @Basic
    @Column(name = "FKZT")
    public Integer getFKZT() {
        return fKZT;
    }
    public void setFKZT(Integer fKZT) {
        this.fKZT = fKZT;
    }
    @Basic
    @Column(name = "SPGH")
    public String getSPGH() {
        return sPGH;
    }
    public void setSPGH(String sPGH) {
        this.sPGH = sPGH;
    }
    @Basic
    @Column(name = "GUID")
    public String getGUID() {
        return gUID;
    }
    public void setGUID(String gUID) {
        this.gUID = gUID;
    }
}

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

@@ -0,0 +1,494 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 眼科处方表1数据
 *
 * */
@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退回原因
    @Basic
    @Id
    @Column(name = "SBXH")
    public Integer getSBXH() {
        return sBXH;
    }
    public void setSBXH(Integer sBXH) {
        this.sBXH = sBXH;
    }
    @Basic
    @Column(name = "CFSB")
    public Integer getCFSB() {
        return cFSB;
    }
    public void setCFSB(Integer cFSB) {
        this.cFSB = cFSB;
    }
    @Basic
    @Column(name = "YPXH")
    public Integer getYPXH() {
        return yPXH;
    }
    public void setYPXH(Integer yPXH) {
        this.yPXH = yPXH;
    }
    @Basic
    @Column(name = "YPCD")
    public Integer getYPCD() {
        return yPCD;
    }
    public void setYPCD(Integer yPCD) {
        this.yPCD = yPCD;
    }
    @Basic
    @Column(name = "XMLX")
    public Integer getXMLX() {
        return xMLX;
    }
    public void setXMLX(Integer xMLX) {
        this.xMLX = xMLX;
    }
    @Basic
    @Column(name = "CFTS")
    public Integer getCFTS() {
        return cFTS;
    }
    public void setCFTS(Integer cFTS) {
        this.cFTS = cFTS;
    }
    @Basic
    @Column(name = "YPSL")
    public Integer getYPSL() {
        return yPSL;
    }
    public void setYPSL(Integer yPSL) {
        this.yPSL = yPSL;
    }
    @Basic
    @Column(name = "YPDJ")
    public Integer getYPDJ() {
        return yPDJ;
    }
    public void setYPDJ(Integer yPDJ) {
        this.yPDJ = yPDJ;
    }
    @Basic
    @Column(name = "HJJE")
    public Integer getHJJE() {
        return hJJE;
    }
    public void setHJJE(Integer hJJE) {
        this.hJJE = hJJE;
    }
    @Basic
    @Column(name = "YPZS")
    public Integer getYPZS() {
        return yPZS;
    }
    public void setYPZS(Integer yPZS) {
        this.yPZS = yPZS;
    }
    @Basic
    @Column(name = "YCSL")
    public String getYCSL() {
        return yCSL;
    }
    public void setYCSL(String yCSL) {
        this.yCSL = yCSL;
    }
    @Basic
    @Column(name = "FYGB")
    public Integer getFYGB() {
        return fYGB;
    }
    public void setFYGB(Integer fYGB) {
        this.fYGB = fYGB;
    }
    @Basic
    @Column(name = "ZFBL")
    public Integer getZFBL() {
        return zFBL;
    }
    public void setZFBL(Integer zFBL) {
        this.zFBL = zFBL;
    }
    @Basic
    @Column(name = "GYTJ")
    public Integer getGYTJ() {
        return gYTJ;
    }
    public void setGYTJ(Integer gYTJ) {
        this.gYTJ = gYTJ;
    }
    @Basic
    @Column(name = "YPYF")
    public String getYPYF() {
        return yPYF;
    }
    public void setYPYF(String yPYF) {
        this.yPYF = yPYF;
    }
    @Basic
    @Column(name = "YPZH")
    public Integer getYPZH() {
        return yPZH;
    }
    public void setYPZH(Integer yPZH) {
        this.yPZH = yPZH;
    }
    @Basic
    @Column(name = "YFGG")
    public String getYFGG() {
        return yFGG;
    }
    public void setYFGG(String yFGG) {
        this.yFGG = yFGG;
    }
    @Basic
    @Column(name = "YFDW")
    public String getYFDW() {
        return yFDW;
    }
    public void setYFDW(String yFDW) {
        this.yFDW = yFDW;
    }
    @Basic
    @Column(name = "YFBZ")
    public Integer getYFBZ() {
        return yFBZ;
    }
    public void setYFBZ(Integer yFBZ) {
        this.yFBZ = yFBZ;
    }
    @Basic
    @Column(name = "SJYL")
    public String getSJYL() {
        return sJYL;
    }
    public void setSJYL(String sJYL) {
        this.sJYL = sJYL;
    }
    @Basic
    @Column(name = "PSPB")
    public Integer getPSPB() {
        return pSPB;
    }
    public void setPSPB(Integer pSPB) {
        this.pSPB = pSPB;
    }
    @Basic
    @Column(name = "YYTS")
    public Integer getYYTS() {
        return yYTS;
    }
    public void setYYTS(Integer yYTS) {
        this.yYTS = yYTS;
    }
    @Basic
    @Column(name = "YCSL2")
    public Integer getYCSL2() {
        return yCSL2;
    }
    public void setYCSL2(Integer yCSL2) {
        this.yCSL2 = yCSL2;
    }
    @Basic
    @Column(name = "XSSL")
    public Integer getXSSL() {
        return xSSL;
    }
    public void setXSSL(Integer xSSL) {
        this.xSSL = xSSL;
    }
    @Basic
    @Column(name = "MRCS")
    public Integer getMRCS() {
        return mRCS;
    }
    public void setMRCS(Integer mRCS) {
        this.mRCS = mRCS;
    }
    @Basic
    @Column(name = "CFBZ")
    public String getCFBZ() {
        return cFBZ;
    }
    public void setCFBZ(String cFBZ) {
        this.cFBZ = cFBZ;
    }
    @Basic
    @Column(name = "YCJL")
    public Integer getYCJL() {
        return yCJL;
    }
    public void setYCJL(Integer yCJL) {
        this.yCJL = yCJL;
    }
    @Basic
    @Column(name = "PSJG")
    public Integer getPSJG() {
        return pSJG;
    }
    public void setPSJG(Integer pSJG) {
        this.pSJG = pSJG;
    }
    @Basic
    @Column(name = "PLXH")
    public Integer getPLXH() {
        return pLXH;
    }
    public void setPLXH(Integer pLXH) {
        this.pLXH = pLXH;
    }
    @Basic
    @Column(name = "SYBZ")
    public Integer getSYBZ() {
        return sYBZ;
    }
    public void setSYBZ(Integer sYBZ) {
        this.sYBZ = sYBZ;
    }
    @Basic
    @Column(name = "ZBBZ")
    public Integer getZBBZ() {
        return zBBZ;
    }
    public void setZBBZ(Integer zBBZ) {
        this.zBBZ = zBBZ;
    }
    @Basic
    @Column(name = "YDFYBZ")
    public Integer getYDFYBZ() {
        return yDFYBZ;
    }
    public void setYDFYBZ(Integer yDFYBZ) {
        this.yDFYBZ = yDFYBZ;
    }
    @Basic
    @Column(name = "TYSQSL")
    public Integer getTYSQSL() {
        return 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;
    }
    public void setYDFYRQ(Date yDFYRQ) {
        this.yDFYRQ = yDFYRQ;
    }
    @Basic
    @Column(name = "YDFYR")
    public String getYDFYR() {
        return yDFYR;
    }
    public void setYDFYR(String yDFYR) {
        this.yDFYR = yDFYR;
    }
    @Basic
    @Column(name = "CZGH")
    public Integer getCZGH() {
        return 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;
    }
    public void setCZRQ(Date cZRQ) {
        this.cZRQ = cZRQ;
    }
    @Basic
    @Column(name = "ZJFLAG")
    public Integer getZJFLAG() {
        return zJFLAG;
    }
    public void setZJFLAG(Integer zJFLAG) {
        this.zJFLAG = zJFLAG;
    }
    @Basic
    @Column(name = "MBYF")
    public Integer getMBYF() {
        return mBYF;
    }
    public void setMBYF(Integer mBYF) {
        this.mBYF = mBYF;
    }
    @Basic
    @Column(name = "BZ")
    public String getBZ() {
        return bZ;
    }
    public void setBZ(String bZ) {
        this.bZ = bZ;
    }
    @Basic
    @Column(name = "JHJG")
    public Integer getJHJG() {
        return jHJG;
    }
    public void setJHJG(Integer jHJG) {
        this.jHJG = jHJG;
    }
    @Basic
    @Column(name = "SPZT")
    public Integer getSPZT() {
        return sPZT;
    }
    public void setSPZT(Integer sPZT) {
        this.sPZT = sPZT;
    }
    @Basic
    @Column(name = "THYY")
    public String getTHYY() {
        return tHYY;
    }
    public void setTHYY(String tHYY) {
        this.tHYY = tHYY;
    }
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/YkyyController.java

@@ -1,5 +1,9 @@
package com.yihu.jw.entrance.controller;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.hospital.prescription.HlwCf01DO;
import com.yihu.jw.entity.hospital.prescription.HlwCf02DO;
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -13,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.io.IOException;
import java.util.Map;
/**
@@ -26,6 +30,8 @@ public class YkyyController extends EnvelopRestEndpoint {
    @Autowired
    private YkyyEntranceService ykyyEntranceService;
    @Autowired
    private ObjectMapper objectMapper;
    @GetMapping(value = "/createSQLQuery")
    @ApiOperation(value = "视图统一查询")
@@ -39,4 +45,24 @@ public class YkyyController extends EnvelopRestEndpoint {
                                      @RequestParam(value = "size",required = false)Integer size){
        return success(ykyyEntranceService.createSQLQuery(sql,params,page,size));
    }
    @GetMapping(value = "/save")
    @ApiOperation(value = "视图统一查询")
    public Envelop save(@ApiParam(name = "json", value = "json", required = true)
                                      @RequestParam(value = "json",required = true)String json,
                        @ApiParam(name = "table", value = "table", required = true)
                        @RequestParam(value = "table",required = true)String table) throws IOException {
        Envelop envelop = new Envelop();
        JSONObject object = JSONObject.parseObject(json);
        if (table.equalsIgnoreCase("HLW_CF01")){
            HlwCf01DO hlwCf01VO =  JSONObject.toJavaObject(object,HlwCf01DO.class);
            ykyyEntranceService.save(hlwCf01VO);
        }else if (table.equalsIgnoreCase("HLW_CF02")){
            HlwCf02DO hlwCf01VO =  JSONObject.toJavaObject(object,HlwCf02DO.class);
            ykyyEntranceService.save(hlwCf01VO);
        }
        return success(envelop);
    }
}

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

@@ -125,6 +125,8 @@ testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
---
spring:
  profiles: jwprod
@@ -154,6 +156,50 @@ testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
# 眼科医院前置机
spring:
  profiles: jwOracleTest
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@172.26.0.141:1521:helowin
    username: normal
    password: normal
  jpa:
    properties:
      hibernate:
        dialect: org.hibernate.dialect.Oracle10gDialect
        show_sql: true
    database: oracle
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.16.1.42:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://192.0.33.26:8888/
fast-dfs:
  tracker-server: 192.168.103.159:22122 #服务器地址
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
---
# 眼科医院前置机
spring:
@@ -192,6 +238,8 @@ testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
---
#心脏中心前置机配置

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/MultipleCode/MultipleCoderController.java

@@ -106,7 +106,7 @@ public class MultipleCoderController extends EnvelopRestEndpoint {
            } else {
//                注册成功 返回空
                return null;
                return MixEnvelop.getSuccess("注册成功",null);
            }
        } catch (Exception e){
            e.printStackTrace();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/ykyy/YkyyController.java

@@ -223,6 +223,46 @@ public class YkyyController extends EnvelopRestEndpoint {
    }
    /**
     * 获取微信支付参数
     *
     * @param relationCode 关联code
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "selectOrderByRelationCode", method = RequestMethod.POST)
    @ApiOperation("获取微信支付参数")
    public ObjEnvelop selectOrderByRelationCode(
            @ApiParam(name = "relationCode", value = "relationCode", required = true)
            @RequestParam(required = true)String relationCode) throws Exception {
        try {
            return ObjEnvelop.getSuccess("ok",businessOrderService.selectOrderByRelationCode(relationCode,wxId));
        } catch (Exception e) {
            return ObjEnvelop.getError(e.getMessage());
        }
    }
    /**
     *
     * 获取眼科通数据
     * @param patient
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "registerYkt", method = RequestMethod.POST)
    @ApiOperation("获取眼科通数据")
    public ObjEnvelop registerYkt(
            @ApiParam(name = "patient", value = "patient", required = true)
            @RequestParam(required = true)String patient) throws Exception {
        try {
            ykyyService.registerYkt(patient);
            return ObjEnvelop.getSuccess("ok","");
        } catch (Exception e) {
            return ObjEnvelop.getError(e.getMessage());
        }
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java

@@ -222,7 +222,7 @@ public class MultipleCodeService {
        EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl()+"ehcService/gateway.do", oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getAppKey());
        TransResponse re = ehcHandler.execute(request);
        JSONObject jsonObject = new JSONObject();
        if ((JSONObject.parseObject(re.getRet_code()).toJSONString()).equalsIgnoreCase("0000")){
        if (re.getRet_code().equalsIgnoreCase("0000")){
            patientDO.setRegister("1");
            String idCard = JSONObject.parseObject(re.getBiz_content()).getString("id_no");
            if (idCard!=null)
@@ -293,7 +293,7 @@ public class MultipleCodeService {
        request.setBiz_content(JSONObject.toJSONString(bizContent));
        EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl()+"ehcService/gateway.do", oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getAppKey());
        TransResponse re = ehcHandler.execute(request);
        if ("0000".equals(JSONObject.parseObject(re.getRet_code()))){
        if ("0000".equalsIgnoreCase(re.getRet_code())){
            return MixEnvelop.getSuccess("获取用户信息成功",re);
        }
        return MixEnvelop.getError("获取用户信息失败");

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

@@ -182,7 +182,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
wechat:
  id: xm_test_ihealth_wx  # base库中,wx_wechat 的id字段
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP

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){

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/util/ISqlUtils.java

@@ -28,7 +28,7 @@ public class ISqlUtils {
        }else if(isFlag.equalsIgnoreCase("*")){
            sb.append("select * from ").append(tableName).append(" where 1=1 ");
        }else if (isFlag.equalsIgnoreCase("sort")){
            sb.append("select * from ").append(tableName).append(" where 1=1 ");
            sb.append("select * from ").append(tableName).append(" where 1=1 and type<>'健康计划' ");
        }
        JSONObject object1  = (JSONObject) JSONObject.toJSON(object);
        if (object1.getString("id") !=null){
@@ -84,7 +84,6 @@ public class ISqlUtils {
        }else if (StringUtils.isNoneBlank(endTime)&&!StringUtils.isNoneBlank(startTime)){
            sb.append(" and end_time <= '"+endTime+"'");
        }
        sb.append(" and type<>'健康计划'");
        if(isFlag.equalsIgnoreCase("*")){
            sb.append(" ORDER BY create_time DESC ").append("LIMIT ").append((page-1)*size+",").append(size);
        }
@@ -99,7 +98,7 @@ public class ISqlUtils {
        Class c =object.getClass();
        Table table = (Table)c.getAnnotation(Table.class);
        String tableName = table.name();
        sb.append("select * from ").append(tableName).append(" where 1=1 and type<>'健康计划' ");
        sb.append("select * from ").append(tableName).append(" where 1=1 ");
        Field[] fArray= c.getDeclaredFields();
        for(Field f:fArray){
            //拿到字段后与实体类中的属性匹配，并得到其get方法，用来获取他的属性值

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/SpecialistController.java

@@ -126,9 +126,11 @@ public class SpecialistController extends EnvelopRestEndpoint {
                                                        @ApiParam(name = "teamCode", value = "医生当前所在团队") @RequestParam(required = true) String teamCode,
                                                        @ApiParam(name = "labelCode", value = "标签code") @RequestParam(required = true)String labelCode,
                                                        @ApiParam(name = "page", value = "第几页，1开始") @RequestParam(required = true)Integer page,
                                                        @ApiParam(name = "size", value = "每页大小") @RequestParam(required = true)Integer size){
                                                        @ApiParam(name = "size", value = "每页大小") @RequestParam(required = true)Integer size,
                                                        @ApiParam(name = "shareDoctor", value = "共管医生") @RequestParam(required = false)String shareDoctor
                                                                        ){
        try {
            return specialistService.getPatientByLabel(doctor,labelType,teamCode,labelCode,page,size);
            return specialistService.getPatientByLabel(doctor,labelType,teamCode,labelCode,page,size,shareDoctor);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
@@ -142,9 +144,10 @@ public class SpecialistController extends EnvelopRestEndpoint {
    public MixEnvelop<Long, Long> getLabelpatientCount(@ApiParam(name = "doctor", value = "医生") @RequestParam(required = true)String doctor,
                                                 @ApiParam(name = "labelType", value = "标签类型") @RequestParam(required = true)String labelType,
                                                       @ApiParam(name = "teamCode", value = "医生团队") @RequestParam(required = true)Long teamCode,
                                                 @ApiParam(name = "labelCode", value = "标签code") @RequestParam(required = true)String labelCode) {
                                                 @ApiParam(name = "labelCode", value = "标签code") @RequestParam(required = true)String labelCode,
                                                       @ApiParam(name = "labelCode", value = "标签code") @RequestParam(required = false)String shareDoctor) {
        try {
            return specialistService.getLabelpatientCount(doctor,labelType,labelCode,teamCode);
            return specialistService.getLabelpatientCount(doctor,labelType,labelCode,teamCode,shareDoctor);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistService.java

@@ -187,7 +187,7 @@ public class SpecialistService{
    }
    public MixEnvelop<PatientLabelVO, PatientLabelVO> getPatientByLabel(String doctor, String labelType,String teamCode, String labelCode, Integer page, Integer size){
    public MixEnvelop<PatientLabelVO, PatientLabelVO> getPatientByLabel(String doctor, String labelType,String teamCode, String labelCode, Integer page, Integer size,String shareDoctor){
        String sql="SELECT " +
                " p. NAME, " +
                " p. CODE, " +
@@ -206,7 +206,8 @@ public class SpecialistService{
                " lb.label AS healthcode ," +
                " s.health_assistant AS healthAssistant," +
                " s.health_assistant_name AS healthAssistantName," +
                " s.is_manage AS isManage" +
                " s.is_manage AS isManage," +
                " s.id AS specialCode" +
                " FROM " +
                " ( " +
                "  SELECT " +
@@ -222,8 +223,11 @@ public class SpecialistService{
                "  AND i.`status` = '1' " +
                " ) lb " +
                " JOIN "+basedb+".wlyy_patient p ON p. CODE = lb.patient " +
                " JOIN wlyy_specialist_patient_relation s ON s.patient = lb.patient " +
                " WHERE s.team_code ='" +teamCode+"' "+
                " JOIN wlyy_specialist_patient_relation s ON s.patient = lb.patient ";
        if(StringUtils.isNotBlank(shareDoctor)){
            sql = sql + " JOIN "+basedb+".wlyy_doctor_special_share sp ON s.id = sp.special_code and sp.doctor = '"+shareDoctor+"' ";
        }
        sql = sql +" WHERE s.team_code ='" +teamCode+"' "+
                " AND s.status >=0  AND s.sign_status >0"+
                " LIMIT "+(page-1)*size+","+size;
        System.out.print("日志："+sql);
@@ -239,11 +243,15 @@ public class SpecialistService{
                    "d.label AS healthcode," +
                    "a.health_assistant AS healthAssistant," +
                    "a.health_assistant_name AS healthAssistantName, " +
                    "a.is_manage AS isManage " +
                    "a.is_manage AS isManage, " +
                    "a.id AS specialCode " +
                    "FROM wlyy_specialist.wlyy_specialist_patient_relation a " +
                    "JOIN "+basedb+".wlyy_patient_disease_server b ON a.id=b.specialist_relation_code AND b.disease=" +labelCode+" and b.del=1 "+
                    "JOIN "+basedb+".wlyy_patient c ON a.patient=c.CODE " +
                    "LEFT JOIN "+basedb+".wlyy_sign_patient_label_info d ON a.patient=d.patient AND d.label_type=8 AND d.`status`=1" +
                    "JOIN "+basedb+".wlyy_patient c ON a.patient=c.CODE ";
            if(StringUtils.isNotBlank(shareDoctor)){
                sql = sql + " JOIN "+basedb+".wlyy_doctor_special_share sp ON a.id = sp.special_code and sp.doctor = '"+shareDoctor+"' ";
            }
            sql = sql +"LEFT JOIN "+basedb+".wlyy_sign_patient_label_info d ON a.patient=d.patient AND d.label_type=8 AND d.`status`=1" +
                    " WHERE a.sign_status> 0 AND a.`status`>=0 " +
//                    "AND a.doctor='"+doctor+"' OR a.health_assistant= '"+doctor+
                    " AND a.team_code ='" +teamCode+"' "+
@@ -271,7 +279,7 @@ public class SpecialistService{
        return MixEnvelop.getSuccess(SpecialistMapping.api_success,PatientLabelVOs);
    }
    public MixEnvelop<Long, Long> getLabelpatientCount(String doctor, String labelType, String label,Long teamCode){
    public MixEnvelop<Long, Long> getLabelpatientCount(String doctor, String labelType, String label,Long teamCode,String shareDoctor){
        String sql = "SELECT " +
                " COUNT(1) as total " +
                " FROM " +
@@ -280,9 +288,18 @@ public class SpecialistService{
                "   i.label = '"+label+"' "+
                "  AND i.label_type = '"+labelType+"' " +
                "  AND i.`status` = '1' " +
                " AND i.patient in ( " +
                " select patient from  wlyy_specialist_patient_relation  WHERE team_code ='" +teamCode+"' "+
                " AND STATUS >= 0 AND sign_status > 0 )";
                " AND i.patient in (" +
                "SELECT" +
                "a.patient AS patient " +
                "FROM" +
                "wlyy_specialist_patient_relation a ";
        if(StringUtils.isNotBlank(shareDoctor)){
            sql = sql + " JOIN wlyy.wlyy_doctor_special_share b ON b.special_code = a.id AND b.doctor = '"+shareDoctor+"' ";
        }
        sql = sql+"WHERE" +
                "a.team_code = '"+teamCode+"' " +
                "AND a.STATUS >= 0 " +
                "AND a.sign_status > 0)";
        System.out.print("日志："+sql);
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sql);
        Long count = 0L;