【疫情防控代码】

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -494,7 +494,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                                        }
                                    }
                                    System.out.println("flag"+flag);
                                    PatientMedicareCardDO patientMedicareCardDO = basePatientMedicareCardDao.findByCode(jsonObject1.getString("MEDICALCARD"));
                                    PatientMedicareCardDO patientMedicareCardDO = basePatientMedicareCardDao.findByCodeAndPatientCode(jsonObject1.getString("MEDICALCARD"),patientDO.getId());
                                    if (patientMedicareCardDO==null&&flag==false){
                                        patientMedicareCardDO = new PatientMedicareCardDO();
                                        patientMedicareCardDO.setCode(jsonObject1.getString("MEDICALCARD"));
@@ -661,7 +661,13 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    if(null!=map.get("familyMember")){
                        List<PatientMedicareCardDO> list1 = basePatientMedicareCardDao.findByPatientCode(map.get("familyMember").toString());
                        if (list1!=null&&list1.size()!=0){
                            map.put("card",list1.get(0));
                            for (PatientMedicareCardDO patientMedicareCardDO:list1){
                                if (patientMedicareCardDO.getType().equalsIgnoreCase("A_02")){
                                    map.put("clinicid",patientMedicareCardDO.getCode());
                                }else {
                                    map.put("card",patientMedicareCardDO);
                                }
                            }
                            JSONObject object = ykyyEntranceService.selectByAddress(list1.get(0).getCode());
                            if (object!=null){
                                map.put("address",object.getString("address"));

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

@@ -4479,19 +4479,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
        } else if("doctorRefund".equalsIgnoreCase(titelType)) {
            if ("9".equals(type)) {
                contentMsg = "金额已退到门诊预交金。如需退款（15元）请到门诊收费处退款。";
                contentMsg = "金额已退到门诊预交金。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您发起的图文复诊已退号";
            }
            if ("16".equals(type)) {
                contentMsg =  "金额已退到门诊预交金。如需退款（15元）请到门诊收费处退款。";
                contentMsg =  "金额已退到门诊预交金。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您发起的视频复诊已退号";
            }
            if ("1".equals(type)) {
                contentMsg =  "金额已退到门诊预交金。如需退款（15元）请到门诊收费处退款。";
                contentMsg =  "金额已退到门诊预交金。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您发起的图文咨询已退号";
            }
            if ("17".equals(type)) {
                contentMsg = "金额已退到门诊预交金。如需退款（15元）请到门诊收费处退款。";
                contentMsg = "金额已退到门诊预交金。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您发起的视频咨询已退号";
            }
            logger.info("doctorRefund:outpatientId="+outpatientId);
@@ -4521,11 +4521,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else if("systemCancelRemind".equalsIgnoreCase(titelType)){
            //超过24小时未接诊，系统取消
            if ("9".equals(type)) {
                contentMsg = "由于订单取消将不做扣费处理。如需退款（15元）请到门诊收费处退款。";
                contentMsg = "由于订单取消将不做扣费处理。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您的图文复诊因超过24小时未接诊已自动取消图文咨询。";
            }
            if ("16".equals(type)) {
                contentMsg = "由于订单取消将不做扣费处理。如需退款（15元）请到门诊收费处退款。";
                contentMsg = "由于订单取消将不做扣费处理。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您的视频复诊因超过24小时未接诊已自动取消视频咨询。";
            }
            logger.info("系统取消接诊入参:outpatientId="+outpatientId);
@@ -11721,7 +11721,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            businessDO.setUpdateTime(new Date());
            businessOrderDao.save(businessDO);
            logger.info("建档开始");
            com.alibaba.fastjson.JSONObject jdObject = ykyyEntranceService.patientJDKH(cardNo,name,mobile,mediaCard);
            com.alibaba.fastjson.JSONObject jdObject = ykyyEntranceService.patientJDKH(cardNo,name,mobile,mediaCard,null);
            logger.info("建档结束");
            logger.info("更新建档信息");
            BaseJobCategoryDO jobCategoryDO =jobCategoryDao.findByName(firstJobName);

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

@@ -113,9 +113,10 @@ public class WorkTimeService {
        if (StringUtils.isNoneBlank(ywCode)){
            if (ywCode.contains(",")){
                String[] split = ywCode.split(",");
                Integer j =0;
                for (int i = 0;i<split.length;i++){
                    WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById(split[i]);
                    String isCheckDoctorWork = "1";
                    String isCheckDoctorWork = "";
                    if (wlyyHospitalSysDictDO!=null){
                        isCheckDoctorWork = wlyyHospitalSysDictDO.getDictValue();
                    }
@@ -146,14 +147,17 @@ public class WorkTimeService {
                        params.put("endTime",date);
                        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql,params);
                        if(list!=null&&list.size()>0){
                            return true;
                        }else {
                            return false;
                            j++;
                        }
                    }else {
                        return true;
                        j++;
                    }
                }
                if (j>=1){
                    return true;
                }else {
                    return false;
                }
            }else {
                WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById(ywCode);
                String isCheckDoctorWork = "1";

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

@@ -161,7 +161,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patient);
        if(StringUtils.isNotBlank(cardNo)){
            BasePatientDO patientDO = basePatientDao.findByIdAndDel(patient,"1");
            JSONArray res = ykyyEntranceService.findPatientCodeByCardNo(cardNo,false);
            JSONArray res = ykyyEntranceService.findPatientCodeByCardNo(cardNo,false,patientDO.getId());
            if(res !=null&&res.size()>0){
                JSONObject object = (JSONObject) res.get(0);
                if (object.get("brid")!=null){
@@ -627,7 +627,8 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            object.put("charge_code",map.get("ypxh"));
            object.put("drugname",map.get("ypmc"));
            object.put("specification",map.get("yfgg"));
            object.put("pack_unit_name",map.get("jldw"));
            object.put("pack_unit",map.get("yfdw"));
            object.put("pack_unit_name",map.get("yfdw"));
            object.put("yfdw",map.get("yfdw"));
            object.put("pack_size",map.get("yfbz"));
            object.put("yfsx",map.get("yfsx"));//药房属性
@@ -810,7 +811,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                    if (null!=patientMappingDO){
                        jsonObject.put("PAT_NO",patientMappingDO.getMappingCode());
                    }else {
                        JSONArray res = ykyyEntranceService.findPatientCodeByCardNo(patientMedicareCardDO.getCode(),false);
                        JSONArray res = ykyyEntranceService.findPatientCodeByCardNo(patientMedicareCardDO.getCode(),false,patient);
                        patientMappingDO = new PatientMappingDO();
                        if(res !=null&&res.size()>0){
                            JSONObject object = (JSONObject) res.get(0);

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

@@ -620,7 +620,7 @@ public class HcyyEntranceService {
    /**
     * 查询患者就诊卡
     * @param idCard 身份证
     * @param
     * @return
     * @throws Exception
     */
@@ -2188,6 +2188,17 @@ public class HcyyEntranceService {
        return token;
    }
    /**
     * 获取心脏医院token
     * @return
     * @throws Exception
     */
    public String getHcToken() throws Exception{
        String rs = HttpUtil.sendGet("https://wx.xmhcyy.com/weixin/100123/WXXMHC01/getToken.do");
        logger.info("rs ："+rs);
        return rs;
    }
    public String ehospitalNotice(String userName, String idCard, String phone, String title, String url, String content, String contentString) {
        logger.info("ehospitalNotice:");

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

@@ -3319,16 +3319,21 @@ public class YkyyEntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray findPatientCodeByCardNo(String cardNo,boolean demoFlag) throws Exception {
        PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByCode(cardNo);
    public JSONArray findPatientCodeByCardNo(String cardNo,boolean demoFlag,String patientId) throws Exception {
        PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByCodeAndPatientCode(cardNo,patientId);
        String sql = "select x.brid as \"brid\" ,o.pat_no as \"pat_no\",o.card_no as \"card_no\",o.card_stat as \"card_stat\",o.op_date as \"op_date\",o.card_type as \"card_type\",o.card_type_name as \"card_type_name\"  from v_zksg_brcx x,V_HLW_CARDINFO o where  o.pat_no = x.mzhm  ";
        if (patientMedicareCardDO!=null){
            String type = patientMedicareCardDO.getType();
            if (type.equalsIgnoreCase("A_02")){
                sql +=" and x.mzhm='"+cardNo+"' ";
            if (type.equalsIgnoreCase("A_01")){
                sql +=" and UPPER(o.card_no) = UPPER('"+cardNo+"') ";
            }else {
                sql +=" and o.card_no = '"+cardNo+"' ";
                if (type.equalsIgnoreCase("A_02")){
                    sql +=" and x.mzhm='"+cardNo+"' ";
                }else {
                    sql +=" and UPPER(o.card_no) = UPPER('"+cardNo+"') ";
                }
            }
        }
        JSONArray array = new JSONArray();
        Map<String,Object> params = new HashedMap();
@@ -3460,14 +3465,14 @@ public class YkyyEntranceService {
    }
    //判断居民是否建过档，没有就建档
    public JSONObject patientJDKH(String idcard, String name, String phoneNum, String medicare) throws Exception {
    public JSONObject patientJDKH(String idcard, String name, String phoneNum, String medicare,String clinicId) throws Exception {
        JSONObject res = new JSONObject();
        res.put("status", 200);
        Float brid = null;
        //根据身份证查询是否建档
        String sfzhSql = "SELECT jzkh \"jzkh\" ,brid \"brid\" from portal_his.V_ZKSG_BRCX@xec_link where sfzh = '" + idcard + "' order by JDSJ ";
        //根据社保卡查询是否建档
        String jzkhSql = "SELECT brid \"brid\"，sfzh \"sfzh\" from portal_his.V_ZKSG_BRCX@xec_link where jzkh = '" + medicare + "' order by JDSJ ";
        String jzkhSql = "SELECT brid \"brid\"，sfzh \"sfzh\" from portal_his.V_ZKSG_BRCX@xec_link where UPPER(jzkh) = UPPER('" + medicare + "')  order by JDSJ ";
        JSONArray sfzhArray = getSqlResult(sfzhSql);
        int size = sfzhArray.size();
        /*if (size == 1) {
@@ -3497,16 +3502,25 @@ public class YkyyEntranceService {
                }
            }
        } else*/ if (size > 1) {//如果存在多条数据，查看是否有跟当前社保卡号一致的，如果有则跳过，如果社保卡都为空则取其中一条更新，否则就提示与预留卡号不一致
            String sql = "SELECT brid \"brid\" from portal_his.V_ZKSG_BRCX@xec_link where sfzh = '" + idcard + "' and  jzkh = '" + medicare + "' ";
            String sql = "SELECT brid \"brid\" from portal_his.V_ZKSG_BRCX@xec_link where sfzh = '" + idcard + "' and  UPPER(jzkh) = UPPER('" + medicare + "') ";
            JSONArray array = getSqlResult(sql);
            logger.info("查询身份证和社保卡：" + array.toString());
            String sql1 = "SELECT brid \"brid\" from portal_his.V_ZKSG_BRCX@xec_link where sfzh = '" + idcard + "' and  mzhm = '" + clinicId + "' ";
            JSONArray array1 = getSqlResult(sql1);
            logger.info("查询身份证和门诊号：" + array1.toString());
            /*if (array==null||array.size()==0){
                res.put("status", -1);
                res.put("message", "您输入的卡号和该就诊人在医院预留的卡号不一致，请重新输入。");
                return res;
            }*/
            if (array.size() == 1) {
                brid = sfzhArray.getJSONObject(0).getFloat("brid");
                brid = array.getJSONObject(0).getFloat("brid");
                res.put("brid",brid);
                return res;
            }else if (array1.size() == 1) {
                brid = array1.getJSONObject(0).getFloat("brid");
                res.put("brid",brid);
                return res;
            }else if(size >= 6){//查不到数据就判断建档次数，超过6次不让新增
                res.put("status", -1);

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

@@ -240,7 +240,7 @@ public class YkyyService {
        if ("17".equalsIgnoreCase(orderType)){
            orderType = "3";
        }
        String url = yktUrl+"doc_jkzl/add_inquiry_order?order_no="+orderNo+"&patient_id="+patientId+"&order_amout="+orderAmout+"&description="+description+
        String url = yktUrl+"doc_jkzl/add_inquiry_order?order_no="+orderNo+"&patient_id="+patientId+"&order_amout="+orderAmout+"&description="+URLEncoder.encode(description)+
                "&state="+state+"&order_type="+orderType+"&doctor_id="+doctorId+"&pay_type="+payType+"&patient_tel="+patientTel+"&order_category="+orderCategory;
        if (StringUtils.isNoneBlank(payAccount)){
            url+="&pay_accout="+payAccount;

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

@@ -1435,6 +1435,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                }else if (wechatId.equalsIgnoreCase("xm_xzzx_wx")){
                    String url="https://ih.xmheart.com/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("xm_xzzx_wx",outpatientDO.getDoctor(),title,msg,url);
                }else if (wechatId.equalsIgnoreCase("xm_hcyy_wx")){
                    String url="https://hlwyy.xmhcyy.com/hcyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("xm_hcyy_wx",outpatientDO.getDoctor(),title,msg,url);
                }
                System.out.println("发送企业模板消息成功");
                try {
@@ -1499,6 +1502,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
               }else if (wechatId.equalsIgnoreCase("xm_xzzx_wx")){
                   String url="https://ih.xmheart.com/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                   enterpriseService.sendTWMesByDoctor("xm_xzzx_wx",outpatientDO.getDoctor(),title,msg,url);
               }else if (wechatId.equalsIgnoreCase("xm_hcyy_wx")){
                   String url="https://hlwyy.xmhcyy.com/hcyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                   enterpriseService.sendTWMesByDoctor("xm_hcyy_wx",outpatientDO.getDoctor(),title,msg,url);
               }
               prescriptionService.sendWxTemplateMsg(wechatId, wlyyOutpatientDO.getId(),null, type, "paySuccess", "");
               System.out.println("发送企业模板消息成功");
@@ -1585,6 +1591,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                    }else if (wxId.equalsIgnoreCase("xm_ykyy_wx")){
                        String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                        enterpriseService.sendTWMesByDoctor("xm_ykyy_wx",outpatientDO.getDoctor(),title,msg,url);
                    }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
                        String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                        enterpriseService.sendTWMesByDoctor("xm_hcyy_wx",outpatientDO.getDoctor(),title,msg,url);
                    }
                    if ("xm_zsyy_wx".equalsIgnoreCase(wechatId)&&StringUtils.isNoneBlank(wlyyOutpatientDO.getDoctor())){
                        String msgUrl="https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId="+wlyyOutpatientDO.getId();
@@ -1637,6 +1646,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                }else if (wxId.equalsIgnoreCase("xm_ykyy_wx")){
                    String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("xm_ykyy_wx",outpatientDO.getDoctor(),title,msg,url);
                }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
                    String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("xm_hcyy_wx",outpatientDO.getDoctor(),title,msg,url);
                }
                if ("xm_zsyy_wx".equalsIgnoreCase(wechatId)&&StringUtils.isNoneBlank(wlyyOutpatientDO.getDoctor())){
                    String msgUrl="https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId="+wlyyOutpatientDO.getId();

business/base-service/src/main/java/com/yihu/jw/patient/dao/BasePatientMedicareCardDao.java

@@ -20,7 +20,7 @@ public interface BasePatientMedicareCardDao extends PagingAndSortingRepository<P
    PatientMedicareCardDO findByCode(String code);
    @Query("from PatientMedicareCardDO where  code= ?1 and patientCode = ?2")
    @Query("from  PatientMedicareCardDO where  code= ?1 and patientCode = ?2")
    PatientMedicareCardDO findByCodeAndPatientCode(String code ,String patientCode);
    PatientMedicareCardDO findByTypeAndPatientCodeAndDel(String Type,String patientCode,String del);

business/base-service/src/main/java/com/yihu/jw/wechat/service/WechatInfoService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.wechat.service;
import com.yihu.jw.entity.base.wx.JsApiTicket;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.HcyyEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.TnyyEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
@@ -25,6 +26,8 @@ public class WechatInfoService {
    private XzzxEntranceService xzzxEntranceService;
    @Autowired
    private TnyyEntranceService tnyyEntranceService;
    @Autowired
    private HcyyEntranceService hcyyEntranceService;
    /**
     * 通过code获取判断openid
@@ -69,7 +72,7 @@ public class WechatInfoService {
            WxWechatDO wxWechat = null;
            
            //中山医院互联网医院
            if("xm_zsyy_wx".equals(wxId) || "xm_xzzx_wx".equals(wxId) || "xm_ykyy_wx".equals(wxId)||"sd_tnzyy_wx".equals(wxId)){
            if("xm_zsyy_wx".equals(wxId) || "xm_xzzx_wx".equals(wxId) || "xm_ykyy_wx".equals(wxId)||"xm_hcyy_wx".equals(wxId)){
                jsapiTickets = wxAccessTokenService.findJsapiTicket(wxId);
            }else{
                wxWechat = wxAccessTokenService.getWxInfo(wxId);
@@ -100,8 +103,8 @@ public class WechatInfoService {
            }else if("xm_xzzx_wx".equals(wxId)){
                token = xzzxEntranceService.getXzToken();
            }else if("xm_xzzx_wx".equals(wxId)){
                token = xzzxEntranceService.getXzToken();
            }else if("xm_hcyy_wx".equals(wxId)){
                token = hcyyEntranceService.getHcToken();
            }else if("sd_tnzyy_wx".equals(wxId)){
                com.alibaba.fastjson.JSONObject jsonObject = tnyyEntranceService.getAccessToken();
                if (jsonObject.getString("ResultCode")!=null&&jsonObject.getString("ResultCode").equalsIgnoreCase("0")){
@@ -126,7 +129,7 @@ public class WechatInfoService {
                    JsApiTicket newJsApiTicket = new JsApiTicket();
                    newJsApiTicket.setJsapi_ticket(ticket);
                    newJsApiTicket.setExpires_in(Long.parseLong(expires_in));
                    if("xm_zsyy_wx".equals(wxId) || "xm_xzzx_wx".equals(wxId) || "xm_ykyy_wx".equals(wxId)||"sd_tnzyy_wx".equals(wxId)){
                    if("xm_zsyy_wx".equals(wxId) || "xm_xzzx_wx".equals(wxId) || "xm_ykyy_wx".equals(wxId)||"xm_hcyy_wx".equals(wxId)){
                        newJsApiTicket.setAcc_id(wxId);
                    }else{
                        newJsApiTicket.setAcc_id(wxWechat.getAppOriginId());

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -298,7 +298,7 @@ public class WlyyBusinessService {
                    String cardType = object.getString("CARD_TYPE");
                    String cardNo = object.getString("CARD_NO");
                    String cardTypeName = object.getString("CARD_TYPE_NAME");
                    PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByCode(cardNo);
                    PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByCodeAndPatientCode(cardNo,patientId);
                    if (patientMedicareCardDO==null){
                        patientMedicareCardDO = new PatientMedicareCardDO();
                        patientMedicareCardDO.setCode(cardNo);
@@ -328,7 +328,7 @@ public class WlyyBusinessService {
                    String cardType = jsonObject.getString("CARD_TYPE");
                    String cardNo = jsonObject.getString("CARD_NO");
                    String cardTypeName = jsonObject.getString("CARD_TYPE_HIS");
                    PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByCode(cardNo);
                    PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByCodeAndPatientCode(cardNo,patientId);
                    if (patientMedicareCardDO==null){
                        patientMedicareCardDO = new PatientMedicareCardDO();
                        patientMedicareCardDO.setCode(cardNo);

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -3980,11 +3980,14 @@ public class ImService {
		if ("xm_ykyy_wx".equals(wxId)) {
			if (flag) {
				sql = sql + "date_format(op.create_time,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
				sql = sql + "date_format(op.end_time,'%Y-%m-%d %H:%i:%S' )  AS \"endTime\", ";
			} else {
				sql = sql + "to_char(op.create_time,'YYYY-MM-DD hh24:mi:ss')  AS \"czrq\",";
				sql = sql + "to_char(op.end_time,'YYYY-MM-DD hh24:mi:ss')  AS \"endTime\",";
			}
		} else {
			sql = sql + "date_format(op.create_time,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
			sql = sql + "date_format(op.end_time,'%Y-%m-%d %H:%i:%S' )  AS \"endTime\",";
		}
		sql = sql + "op.status AS \"status\"," +
				"b.evaluate AS \"evaluate\"," +
@@ -4001,7 +4004,10 @@ public class ImService {
				"op.icd10_name as \"icd10Name\"," +
				"d.photo AS \"patientPhoto\" , " +
				"op.doctor as \"doctor\" ," +
				"op.source as \"source\"  " +
				"op.source as \"source\"  ," +
				"op.card_no as \"cardNo\"  ," +
				"op.patient_cancel_value as \"patientCancelValue\" ," +
				"op.patient_cancel_remark as \"patient_cancel_remark\"  " +
				"FROM wlyy_outpatient op LEFT JOIN wlyy_consult a  ON a.relation_code = op.id \n" +
				" LEFT join wlyy_consult_team b on a.id = b.consult" +
				" LEFT JOIN base_patient d on op.patient = d.id " +

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

@@ -353,7 +353,8 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                }
                //获取建档信息
                if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                    JSONObject jdObject = ykyyEntranceService.patientJDKH(idCard,familyName,username,medicare);
                    JSONObject jdObject = ykyyEntranceService.patientJDKH(idCard,familyName,username,medicare,clinicId);
                    if (jdObject!=null){
                        if(jdObject.getInteger("status") == 200) {
                            mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId);

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

@@ -224,6 +224,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                vos = prescriptionService.findOutpatientList(patient, startTime, endTime, demoFlag,ksdm,cardNo);
            }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
                vos = tnPrescriptionService.findOutpatientList(patient, cardNo,startTime, endTime, demoFlag,ksdm,flag);
            }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            }else {
                return ListEnvelop.getError("尚未开发！");
            }
@@ -247,6 +249,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                obj = prescriptionService.findOutpatientInfo(patient,conNo);
            }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
                obj = tnPrescriptionService.findOutpatientInfo(patient,conNo,demoFlag,null);
            }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            }else {
                return ObjEnvelop.getError("尚未开发！");
            }
@@ -274,6 +278,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                obj= prescriptionService.findOriginPrescriptionList(registerSn, patNo, realOrder, admNo,demoFlag);
            }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
                obj= tnPrescriptionService.findOriginPrescriptionList(registerSn, patNo, realOrder, admNo,demoFlag);
            }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            }else {
                return ListEnvelop.getError("尚未开发！");
            }
@@ -619,10 +625,12 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(xzzxEntranceService.selectIcd10Dict(pyKey));
        }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
            return success(tnPrescriptionService.getICD10(pyKey,false));
        }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            ListEnvelop listEnvelop = new ListEnvelop();
            return listEnvelop;
        }else {
            return ListEnvelop.getError("尚未开发！");
        }
        
    }
    
@@ -643,6 +651,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(xzzxEntranceService.selectDrugDict(pyKey,drugNo));
        }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
            return success(tnPrescriptionService.getDrugDictionary(drugNo,pyKey,null,groupNo,null));
        }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            ListEnvelop listEnvelop = new ListEnvelop();
            return listEnvelop;
        }else {
            return ListEnvelop.getError("尚未开发！");
        }
@@ -661,6 +672,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(xzzxEntranceService.selectMedicineUsed(pyKey));
        }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
            return success(tnPrescriptionService.getDrugUse(pyKey,demoFlag));
        }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            ListEnvelop listEnvelop = new ListEnvelop();
            return listEnvelop;
        }else {
            return ListEnvelop.getError("尚未开发！");
        }
@@ -677,6 +691,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(xzzxEntranceService.selectFrequencyDict());
        }else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")){
            return success(tnPrescriptionService.getDrugFrequency(demoFlag));
        }else if (wxId.equalsIgnoreCase("xm_hcyy_wx")){
            ListEnvelop listEnvelop = new ListEnvelop();
            return listEnvelop;
        }else {
            return ListEnvelop.getError("尚未开发！");
        }