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/family/dao/BasePatientMemberDictDao.java

@@ -12,4 +12,7 @@ import java.util.List;
public interface BasePatientMemberDictDao extends PagingAndSortingRepository<BasePatientMemberDictDO, String>, JpaSpecificationExecutor<BasePatientMemberDictDO> {
    @Query("from BasePatientMemberDictDO t where t.isDel = 1")
    List<BasePatientMemberDictDO> findDictAll();
    @Query("from BasePatientMemberDictDO t where t.relationName = ?1 and t.isDel = 1")
    BasePatientMemberDictDO findByRelationName(String illness);
}

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

@@ -14,4 +14,6 @@ public interface WlyyPatientFamilyMemberDao extends PagingAndSortingRepository<W
    List<WlyyPatientFamilyMemberDO> findByPatientAndFamilyRelation(String patient,String familyRelation);
    @Query("from WlyyPatientFamilyMemberDO t where t.id=?1  and t.isDel = 1")
    WlyyPatientFamilyMemberDO findByIdAndDel(String id);
    @Query("from WlyyPatientFamilyMemberDO t where t.cardNo=?1 and t.patient=?2  and t.isDel =1")
    WlyyPatientFamilyMemberDO findbyCardNoAndPatient(String idCard,String patient);
}

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

@@ -11,14 +11,19 @@ import com.yihu.jw.hospital.family.dao.WlyyPatientFamilyMemberDao;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import jdk.management.resource.internal.inst.SocketOutputStreamRMHooks;
import net.sf.json.JSON;
import net.sf.json.JSONArray;
import org.apache.commons.lang.StringUtils;
import org.checkerframework.checker.units.qual.A;
@@ -50,12 +55,14 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
    private YkyyEntranceService ykyyEntranceService;
    @Autowired
    private BasePatientMedicareCardDao basePatientMedicareCardDao;
    @Autowired
    private YkyyService ykyyService;
    @Value("${wechat.id}")
    private String wxId;
    //添加关联家属
    @Transactional
    public MixEnvelop addFamily(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare) throws Exception {
    public MixEnvelop addFamily(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        try{
        BasePatientMemberDictDO basePatientMemberDictDO = basePatientMemberDictDao.findOne(dictId);
@@ -79,11 +86,12 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        }
        String familyId="";
        String birth = "";
        String yktFamilyId = "";
        int sex=3;
        //获取his家属数据
        JSONArray jsonArray = new JSONArray();
        if("xm_ykyy_wx".equalsIgnoreCase(wxId)){
            jsonArray = ykyyEntranceService.findHisPatientBymMedicare(medicare,false);
            jsonArray = ykyyEntranceService.findHisPatientBymMedicare(medicare,clinicId,false);
            if(jsonArray!=null&&jsonArray.size()>0){
                net.sf.json.JSONObject jsonObject= net.sf.json.JSONObject.fromObject(jsonArray.get(0).toString());
                if (null!=jsonObject.get("brid")){
@@ -98,6 +106,63 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    long lt = new Long(birth);
                    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
                    birth = sf.format(lt);
                    String familySex = IdCardUtil.getSexForIdcard(idCard);
                    if (familySex.equalsIgnoreCase("男")){
                        familySex= "1";
                    }else if (familySex.equalsIgnoreCase("女")){
                        familySex = "0";
                    }else {
                        familySex = "2";
                    }
                    String familyAge = String.valueOf(IdCardUtil.getAgeForIdcard(idCard));
                    BasePatientMemberDictDO basePatientMemberDictDO1 = basePatientMemberDictDao.findOne(dictId);
                    String relationName = "";
                    if (null!=basePatientMemberDictDO1){
                        relationName=basePatientMemberDictDO1.getRelationName();
                    }
                    BasePatientDO basePatientDO1  = basePatientDao.findById(patientId);
                    String res = "";
                    //id不为空则为修改家人关系
                    if (StringUtils.isNotBlank(id)){
                        if (null!=basePatientDO1){
                            res = ykyyService.updateYktFamily(familyName,idCard, familySex,familyAge,phoneNum,medicare,relationName,clinicId,result.getYktFamilyId(),birth);
                        }
                        if (StringUtils.isNotEmpty(res)){
                            JSONObject jsonObject1 = JSONObject.parseObject(res);
                            if ("200".equalsIgnoreCase(jsonObject1.getString("code"))){
                                /*JSONObject jsonObject2 = JSONObject.parseObject(jsonObject1.getString("data"));
                                yktFamilyId = jsonObject2.getString("ID");*/
                            }else {
                                mixEnvelop.setStatus(408);
                                mixEnvelop.setMessage("更新家人关系至眼科通失败");
                                return mixEnvelop;
                            }
                        }else {
                            mixEnvelop.setStatus(408);
                            mixEnvelop.setMessage("更新家人关系至眼科通失败");
                            return mixEnvelop;
                        }
                    }else {
                        if (null!=basePatientDO1){
                            res = ykyyService.addYktFamily(familyName,idCard, familySex,familyAge,phoneNum,medicare,relationName,"1",basePatientDO1.getUserId(),birth);
                        }
                        if (StringUtils.isNotEmpty(res)){
                            JSONObject jsonObject1 = JSONObject.parseObject(res);
                            if ("200".equalsIgnoreCase(jsonObject1.getString("code"))){
                                JSONObject jsonObject2 = JSONObject.parseObject(jsonObject1.getString("data"));
                                yktFamilyId = jsonObject2.getString("ID");
                            }else {
                                mixEnvelop.setStatus(408);
                                mixEnvelop.setMessage("添加家人关系至眼科通失败");
                                return mixEnvelop;
                            }
                        }else {
                            mixEnvelop.setStatus(408);
                            mixEnvelop.setMessage("添加家人关系至眼科通失败");
                            return mixEnvelop;
                        }
                    }
                    System.out.println("眼科转换后的csny"+birth);
                }else {
                    mixEnvelop.setStatus(408);
@@ -149,6 +214,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        basePatientDO.setBirthday(saveBirth1);
        result.setFamilyRelation(dictId);
        result.setFamilyRelationName(dictName);
        result.setYktFamilyId(yktFamilyId);
        result.setIsDel(1);
        result.setPatient(patientId);
        result.setCardNo(idCard);
@@ -200,7 +266,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    }
                }
                patientMedicareCardDO.setCode(medicare);
                patientMedicareCardDO.setType(medicareType);
                //patientMedicareCardDO.setType(medicareType);
                patientMedicareCardDO.setPatientCode(patientNewId);
                patientMedicareCardDO.setDel("1");
                basePatientMedicareCardDao.save(patientMedicareCardDO);
@@ -215,28 +281,168 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        return mixEnvelop;
    }
    //眼科同步家人信息
    public void saveYktFamily(String patientId) throws Exception{
        try {
            String userId="";
            BasePatientDO basePatientDO = basePatientDao.findById(patientId);
            if (null!=basePatientDO){
                userId = basePatientDO.getUserId();
            }
            List<Map<String, String>> list=new ArrayList<Map<String, String>>();
            String res  = ykyyService.findYktFamily(userId);
            if (StringUtils.isNotEmpty(res)){
                JSONObject jsonObject = JSONObject.parseObject(res);
                if ("200".equalsIgnoreCase(jsonObject.getString("code"))){
                    JSONObject data = JSONObject.parseObject(jsonObject.getString("data"));
                    JSONArray jsonArray = JSONArray.fromObject(data.get("list"));
                    if(jsonArray!=null && jsonArray.size()>0) {
                        for (int i = 0; i < jsonArray.size(); i++) {
                            JSONObject jsonObject1 = JSONObject.parseObject(jsonArray.get(i).toString());
                            System.out.println("==="+jsonArray.get(i).toString());
                            if (StringUtils.isNotEmpty(jsonObject1.getString("IDCARD"))){
                                System.out.println("同步的身份证号："+jsonObject1.getString("IDCARD"));
                                BasePatientDO patientDO = basePatientDao.findByIdcardAndDel(jsonObject1.getString("IDCARD"),"1");
                                if (null==patientDO){
                                    patientDO = new BasePatientDO();
                                }
                                patientDO.setMobile(jsonObject1.getString("TEL"));
                                if(StringUtils.isNotBlank(jsonObject1.getString("BIRTHDAY"))){
                                    patientDO.setBirthday(DateUtil.strToDate(jsonObject1.getString("BIRTHDAY")));
                                }
                                patientDO.setIdcard(jsonObject1.getString("IDCARD"));
                                patientDO.setName(jsonObject1.getString("NAME"));
                                patientDO.setSex(jsonObject1.getInteger("SEX"));
                                patientDO.setDel("1");
                                patientDO.setEnabled(1);
                                patientDO.setLocked(0);
                                patientDO.setCreateTime(new Date());
                                patientDO = basePatientDao.save(patientDO);
                                //取his中的病人code
                                JSONArray hisArray = ykyyEntranceService.findHisPatientBymMedicare(null,patientDO.getIdcard(),false);
                                if(hisArray!=null&&hisArray.size()>0) {
                                    net.sf.json.JSONObject hisObject = net.sf.json.JSONObject.fromObject(hisArray.get(0).toString());
                                    PatientMappingDO patientMappingDO = patientMappingDao.findByIdcard(patientDO.getIdcard());
                                    if(null==patientMappingDO){
                                        patientMappingDO= new PatientMappingDO();
                                    }
                                    patientMappingDO.setPatientName(jsonObject1.getString("NAME"));
                                    patientMappingDO.setPatient(patientDO.getId());
                                    patientMappingDO.setMappingCode(hisObject.getString("brid"));
                                    patientMappingDO.setSource("1");
                                    patientMappingDO.setCreateTime(new Date());
                                    patientMappingDO.setIdcard(patientDO.getIdcard());
                                    patientMappingDao.save(patientMappingDO);
                                }
                                WlyyPatientFamilyMemberDO wlyyPatientFamilyMemberDO = wlyyPatientFamilyMemberDao.findbyCardNoAndPatient(patientDO.getIdcard(),patientId);
                                if (null==wlyyPatientFamilyMemberDO){
                                    wlyyPatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                                }
                                BasePatientMemberDictDO basePatientMemberDictDO =basePatientMemberDictDao.findByRelationName(jsonObject1.getString("ILLNESS"));
                                if (null!=basePatientMemberDictDO){
                                    wlyyPatientFamilyMemberDO.setIsDel(1);
                                    wlyyPatientFamilyMemberDO.setPatient(patientId);
                                    wlyyPatientFamilyMemberDO.setClinicid(jsonObject1.getString("CLINICID"));
                                    wlyyPatientFamilyMemberDO.setCardType("身份证");
                                    wlyyPatientFamilyMemberDO.setFamilyMember(patientDO.getId());
                                    wlyyPatientFamilyMemberDO.setFamilyRelation(basePatientMemberDictDO.getId());
                                    wlyyPatientFamilyMemberDO.setFamilyRelationName(basePatientMemberDictDO.getRelationName());
                                    wlyyPatientFamilyMemberDO.setCardNo(jsonObject1.getString("IDCARD"));
                                    wlyyPatientFamilyMemberDO.setYktFamilyId(jsonObject1.getString("ID"));
                                    wlyyPatientFamilyMemberDao.save(wlyyPatientFamilyMemberDO);
                                }
                                if(null!=jsonObject1.get("MEDICALCARD")){
                                    PatientMedicareCardDO patientMedicareCardDO = basePatientMedicareCardDao.findByCode(jsonObject1.getString("MEDICALCARD"));
                                    if (null==patientMedicareCardDO){
                                        patientMedicareCardDO = new PatientMedicareCardDO();
                                    }
                                    patientMedicareCardDO.setCode(jsonObject1.getString("MEDICALCARD"));
                                    //patientMedicareCardDO.setType(medicareType);
                                    patientMedicareCardDO.setPatientCode(patientDO.getId());
                                    patientMedicareCardDO.setDel("1");
                                    basePatientMedicareCardDao.save(patientMedicareCardDO);
                                }
                            }
                        }
                    }
                }
            }
        } catch (ParseException e) {
            e.printStackTrace();
            System.out.println("同步家人关系失败");
        }
    }
    //根据患者id查询关联家属
    public List<Map<String,Object>> findFamilyByPatientId(String patientId) throws ParseException {
        String sql = "select t.id as \"id\",t.card_type as \"cardType\", " +
                "t.patient as \"patient\",b.name as \"name\",b.sex as \"sex\","+
                "b.birthday as\"birthday\",b.idcard as \"idcard\"," +
                "t.family_member as \"familyMember\",c.relation_name as \"relationName\" "+
                " from wlyy_patient_family_member t left join base_patient b" +
                " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id where 1=1";
        if (StringUtils.isNotBlank(patientId)){
            sql += " and t.patient = '"+patientId+"'";
        }
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        if (list!=null&&list.size()>0){
            for (Map<String,Object> map:list){
                if (map.get("birthday")!=null){
                    SimpleDateFormat sp = new SimpleDateFormat("yyyy-MM-dd");
                    int age = getAgeByBirth(sp.parse(map.get("birthday").toString()));
                    map.put("age",age);
        if("xm_ykyy_wx".equalsIgnoreCase(wxId)){
            try {
                saveYktFamily(patientId);
            }catch (Exception e){
                e.printStackTrace();
            }
            String sql = "select t.id as \"id\",t.card_type as \"cardType\", " +
                    "t.patient as \"patient\",b.name as \"name\",b.sex as \"sex\","+
                    "to_char(b.birthday,'yyyy-MM-dd') as\"birthday\",b.idcard as \"idcard\",t.clinicid as \"clinicid\"," +
                    "t.family_member as \"familyMember\",c.relation_name as \"relationName\" "+
                    " from wlyy_patient_family_member t left join base_patient b" +
                    " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id where 1=1 and t.is_del=1 ";
            if (StringUtils.isNotBlank(patientId)){
                sql += " and t.patient = '"+patientId+"'";
            }
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
            if (list!=null&&list.size()>0){
                for (Map<String,Object> map:list){
                    if (null!=map.get("idcard")){
                        map.put("age",IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
                    }
                    if (null!=map.get("birthday")){
                        System.out.println("birthday:"+map.get("birthday").toString());
                    }
                    List<PatientMedicareCardDO> list1 = basePatientMedicareCardDao.findByPatientCode(patientId);
                    if (null!=list1&&list.size()>0){
                        map.put("card",list1.get(0));
                    }else {
                        map.put("card","");
                    }
                }
            }
            return list;
        }else {
            String sql = "select t.id as \"id\",t.card_type as \"cardType\", " +
                    "t.patient as \"patient\",b.name as \"name\",b.sex as \"sex\","+
                    "b.birthday as\"birthday\",b.idcard as \"idcard\"," +
                    "t.family_member as \"familyMember\",c.relation_name as \"relationName\" "+
                    " from wlyy_patient_family_member t left join base_patient b" +
                    " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id where 1=1 and t.is_del=1 ";
            if (StringUtils.isNotBlank(patientId)){
                sql += " and t.patient = '"+patientId+"'";
            }
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
            if (list!=null&&list.size()>0){
                for (Map<String,Object> map:list){
                    if (map.get("birthday")!=null){
                        SimpleDateFormat sp = new SimpleDateFormat("yyyy-MM-dd");
                        if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                            map.put("birthday",sp.parse(map.get("birthday").toString()));
                        }
                        int age = getAgeByBirth(sp.parse(map.get("birthday").toString()));
                        map.put("age",age);
                    }
                    List<PatientMedicareCardDO> list1 = basePatientMedicareCardDao.findByPatientCode(patientId);
                    map.put("cardList",list1);
                }
            }
            return list;
        }
        return list;
    }
    public static void main(String[] args) {
        String ss ="561657600000";
        Date da = new Date(Long.parseLong(ss));
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        System.out.println(simpleDateFormat.format(da));
    }
    private static int getAgeByBirth(Date birthday) {
        int age = 0;
@@ -265,7 +471,26 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        Envelop envelop = new Envelop();
        WlyyPatientFamilyMemberDO wlyyPatientFamilyMemberDO = wlyyPatientFamilyMemberDao.findOne(id);
        if (wlyyPatientFamilyMemberDO!=null){
            wlyyPatientFamilyMemberDao.delete(id);
            wlyyPatientFamilyMemberDO.setIsDel(0);
            if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                //删除眼科通的家人关系
                String res = ykyyService.deleteYktFamily(wlyyPatientFamilyMemberDO.getYktFamilyId());
                if (StringUtils.isNotEmpty(res)){
                    JSONObject jsonObject = JSONObject.parseObject(res);
                    if ("200".equalsIgnoreCase(jsonObject.getString("code"))){
                        envelop.setMessage("删除成功");
                    }else {
                        envelop.setMessage("删除失败");
                        envelop.setStatus(-1);
                        return envelop;
                    }
                }else {
                    envelop.setMessage("删除失败");
                    envelop.setStatus(-1);
                    return envelop;
                }
            }
            wlyyPatientFamilyMemberDao.save(wlyyPatientFamilyMemberDO);
            envelop.setMessage("删除成功");
            return envelop;
        }else {
@@ -278,11 +503,11 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
    public List<Map<String,Object>>  findMemberById(String id) throws ParseException {
        String sql="select t.id as \"id\",t.card_type as \"cardType\"," +
                "t.family_member as \"familyMember\",t.patient as \"patient\"," +
                "b.name as \"name\",b.idcard as \"idcard\",b.mobile as \"mobile\"," +
                "b.name as \"name\",b.idcard as \"idcard\",b.mobile as \"mobile\",t.clinicid as \"clinicid\"," +
                "c.relation_name \"relationName\",b.birthday as\"birthday\",b.sex as\"sex\"" +
                " from wlyy_patient_family_member t left join base_patient b" +
                " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id " +
                " where 1=1";
                " where 1=1 and t.is_del = 1 ";
        if (StringUtils.isNotBlank(id)){
            sql+=" and t.id='"+id+"'";
        }
@@ -294,6 +519,16 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    int age = getAgeByBirth(sp.parse(map.get("birthday").toString()));
                    map.put("age",age);
                }
                if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                    if(null!=map.get("familyMember")){
                        List<PatientMedicareCardDO> list1 = basePatientMedicareCardDao.findByPatientCode(map.get("familyMember").toString());
                        if (null!=list1&&list.size()>0){
                            map.put("card",list1.get(0));
                        }else {
                            map.put("card","");
                        }
                    }
                }
            }
        }
        return list;

business/base-service/src/main/java/com/yihu/jw/hospital/httplog/service/WlyyHttpLogService.java

@@ -0,0 +1,30 @@
package com.yihu.jw.hospital.httplog.service;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.hospital.family.dao.WlyyPatientFamilyMemberDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service
public class WlyyHttpLogService  extends BaseJpaService<WlyyHttpLogDO, WlyyHttpLogDao> {
    @Autowired
    private WlyyHttpLogDao wlyyHttpLogDao;
    //保存http日志接口
    public  void  saveHttpLog(String code,String name,String patient,String doctor,String request,String response,String status ){
        WlyyHttpLogDO wlyyHttpLogDO = new WlyyHttpLogDO();
        wlyyHttpLogDO.setCode(code);
        wlyyHttpLogDO.setName(name);
        wlyyHttpLogDO.setPatient(patient);
        wlyyHttpLogDO.setDoctor(doctor);
        wlyyHttpLogDO.setRequest(request);
        wlyyHttpLogDO.setResponse(response);
        wlyyHttpLogDO.setStatus(status);
        wlyyHttpLogDO.setCreateTime(new Date());
        wlyyHttpLogDao.save(wlyyHttpLogDO);
    }
}

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

@@ -2412,7 +2412,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDOList.get(0);
                        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(outpatientDO.getId());
                        logger.info("cfsb", wlyyPrescriptionDO.getRealOrder());
                        ykyyService.updateDrugorderInfo(businessOrderDO.getOrderNo(), wlyyPrescriptionDO.getOrderId(), wlyyPrescriptionDO.getRealOrder());
                        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("YKTCONTROL");
                        if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
                        } else {
                            ykyyService.updateDrugorderInfo(businessOrderDO.getOrderNo(), wlyyPrescriptionDO.getOrderId(), wlyyPrescriptionDO.getRealOrder());
                        }
                    }
                }
@@ -7783,7 +7788,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            wlyyPrescriptionDO.setId(prescriptionId);
            wlyyPrescriptionDO.setCheckStatus(status);
            wlyyPrescriptionDO.setCheckReason(reason);
            wlyyPrescriptionDO.setStatus(11);
            if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                wlyyPrescriptionDO.setStatus(10);
            }else{
                wlyyPrescriptionDO.setStatus(11);
            }
        }
        prescriptionDao.save(wlyyPrescriptionDO);
        if (status == 2 || status == 1) {

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

@@ -1555,7 +1555,7 @@ public class YkyyEntranceService {
     * @return
     * @throws Exception
     */
    public net.sf.json.JSONArray findHisPatientBymMedicare(String medicare,boolean demoFlag) throws Exception {
    public net.sf.json.JSONArray findHisPatientBymMedicare(String medicare,String jzkh,boolean demoFlag) throws Exception {
        String sql = "SELECT\n" +
                "\tx.brid AS \"brid\",\n" +
                "\tx.mzhm AS \"mzhm\",\n" +
@@ -1572,8 +1572,13 @@ public class YkyyEntranceService {
                "\tx.lxdz AS \"lxdz\"\n" +
                "FROM\n" +
                "\tV_ZKSG_BRCX x\n" +
                "WHERE\n" +
                "\tx.jzkh = '"+medicare+"' ";
                "WHERE 1=1" ;
        if (StringUtils.isNotBlank(medicare)){
            sql+=" and x.jzkh = '"+medicare+"' ";
        }
        if (StringUtils.isNotBlank(jzkh)){
            sql+=" and x.sfzh = '"+jzkh+"' ";
        }
        net.sf.json.JSONArray array = new net.sf.json.JSONArray();
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);

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

@@ -677,6 +677,68 @@ public class YkyyService {
        logger.info("医生端登陆:"+response);
        return response;
    }
    /*
     *查询眼科通家人关系
     */
    public String findYktFamily(String yktUserId){
        String response="";
        String url="http://www.yanketong.com:133/api/doc_jkzl/get_family_list?";
        url+="user_id="+yktUserId;
        logger.info("查询眼科通家人关系="+url);
        response = httpClientUtil.get(url,"UTF-8");
        logger.info("查询眼科通家人关系结果"+response);
        return response;
    }
    /*
     *删除家人关系
     */
        public String deleteYktFamily(String yktFamilyId){
        String response="";
        String url="http://www.yanketong.com:133/api/patient/delete_family?";
        url+="id="+yktFamilyId;
        logger.info("删除眼科通家人关系="+url);
        response = httpClientUtil.get(url,"UTF-8");
        logger.info("删除眼科通家人关系结果"+response);
        return response;
    }
    //添加家人关系
    public String addYktFamily(String name,String id_card,String sex,String age,String tel,String medical_card,String illness,String clinic_id,String ass_user_id,String birth){
        String response="";
        String url="http://www.yanketong.com:133/api/doc_jkzl/add_family?";
        url+="name="+name;
        url+="&id_card="+id_card;
        url+="&sex="+sex;
        url+="&age="+age;
        url+="&tel="+tel;
        url+="&medical_card="+medical_card;
        url+="&illness="+illness;
        url+="&clinic_id="+clinic_id;
        url+="&ass_user_id="+ass_user_id;
        url+="&birth="+birth;
        logger.info("添加眼科通家人关系="+url);
        response = httpClientUtil.get(url,"UTF-8");
        logger.info("添加眼科通家人关系结果"+response);
        return response;
    }
    //修改家人关系
    public String updateYktFamily(String name,String id_card,String sex,String age,String tel,String medical_card,String illness,String clinic_id,String id,String birth){
        String response="";
        String url="http://www.yanketong.com:133/api/patient/update_family?";
        url+="name="+name;
        url+="&id_card="+id_card;
        url+="&sex="+sex;
        url+="&age="+age;
        url+="&tel="+tel;
        url+="&medical_card="+medical_card;
        url+="&illness="+illness;
        url+="&clinic_id="+clinic_id;
        url+="&id="+id;
        url+="&birth="+birth;
        logger.info("修改眼科通家人关系="+url);
        response = httpClientUtil.get(url,"UTF-8");
        logger.info("修改眼科通家人关系结果"+response);
        return response;
    }
}

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

@@ -152,12 +152,12 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            WlyyOutpatientDO outpatientDO = outpatientDao.findById(wlyyPrescriptionDO.getOutpatientId());
            BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(wlyyPrescriptionDO.getId());
            if (businessOrderDO==null){
            if (businessOrderDO==null) {
                businessOrderDO = new BusinessOrderDO();
                businessOrderDO.setCreateTime(new Date());
                businessOrderDO.setUpdateTime(new Date());
                businessOrderDO.setStatus(0);
                businessOrderDO.setOrderNo("HLWYY"+System.currentTimeMillis()+(int)(Math.random()*900)+100);
                businessOrderDO.setOrderNo("HLWYY" + System.currentTimeMillis() + (int) (Math.random() * 900) + 100);
                businessOrderDO.setUploadStatus(0);
                businessOrderDO.setPayType(1);
                businessOrderDO.setRelationCode(code);
@@ -178,49 +178,58 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                wlyyPrescriptionDO.setOrderId(getCode());
                wlyyPrescriptionDO = prescriptionDao.save(wlyyPrescriptionDO);
                JSONArray array = new JSONArray();
                List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = prescriptionInfoDao.findByPrescriptionId(code,1);
                for (WlyyPrescriptionInfoDO prescriptionInfoDO:wlyyPrescriptionInfoDOS){
                List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = prescriptionInfoDao.findByPrescriptionId(code, 1);
                WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("YKTCONTROL");
                for (WlyyPrescriptionInfoDO prescriptionInfoDO : wlyyPrescriptionInfoDOS) {
                    JSONObject object = new JSONObject();
                    //{"commodityName":"","commodityPrice":"","DrugUnit":"","MedicineDoctor":""}
                    object.put("commodityName",prescriptionInfoDO.getDrugName());
                    object.put("commodityPrice",prescriptionInfoDO.getPackRetprice());
                    object.put("DrugUnit",prescriptionInfoDO.getPackUnitName());
                    object.put("commodityName", prescriptionInfoDO.getDrugName());
                    object.put("commodityPrice", prescriptionInfoDO.getPackRetprice());
                    object.put("DrugUnit", prescriptionInfoDO.getPackUnitName());
                    DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(businessOrderDO.getDoctor());
                    String yktDoctor ="";
                    if (doctorMappingDO!=null&&StringUtils.isNoneBlank(doctorMappingDO.getMappingCode())){
                        String doctorResponse = ykyyService.getYktDoctor(doctorMappingDO.getMappingCode());
                        JSONObject jsonObject = JSONObject.parseObject(doctorResponse);
                        if (jsonObject.getInteger("code")==200){
                            JSONArray array1 = jsonObject.getJSONArray("data");
                            if (array1!=null&&array1.size()!=0){
                                yktDoctor=array1.getJSONObject(0).getString("DOCTORUSERID");
                    String yktDoctor = "";
                    if (doctorMappingDO != null && StringUtils.isNoneBlank(doctorMappingDO.getMappingCode())) {
                        System.out.println("----------------"+hospitalSysDictDO.getDictValue());
                        if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
                        } else {
                            String doctorResponse = ykyyService.getYktDoctor(doctorMappingDO.getMappingCode());
                            JSONObject jsonObject = JSONObject.parseObject(doctorResponse);
                            if (jsonObject.getInteger("code") == 200) {
                                JSONArray array1 = jsonObject.getJSONArray("data");
                                if (array1 != null && array1.size() != 0) {
                                    yktDoctor = array1.getJSONObject(0).getString("DOCTORUSERID");
                                }
                            }
                        }
                    }else {
                    } else {
                        throw new Exception("医生映射表不存在！");
                    }
                    object.put("MedicineDoctor",yktDoctor);
                    object.put("MedicineDoctor", yktDoctor);
                    array.add(object);
                }
                BasePatientDO patientDO = patientDao.findById(businessOrderDO.getPatient());
                String userId =null;
                if (patientDO!=null){
                String userId = null;
                if (patientDO != null) {
                    userId = patientDO.getUserId();
                }
                String response = ykyyService.addOrder4Jkzl("1",wlyyPrescriptionDO.getOrderId(),businessOrderDO.getOrderNo(),userId,array);
                if (StringUtils.isNoneBlank(response)){
                    JSONObject jsonObject = JSONObject.parseObject(response);
                    if (jsonObject.getString("code").equalsIgnoreCase("10000")){
                        String orderId = jsonObject.getString("orderId");
                        String orderNo = jsonObject.getString("orderNo");
                        businessOrderDO.setYkOrderId(orderId);
                        businessOrderDO.setYkOrderNo(orderNo);
                        businessOrderDO.setUploadStatus(1);
                        businessOrderDao.save(businessOrderDO);
                if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
                } else {
                    String response = ykyyService.addOrder4Jkzl("1", wlyyPrescriptionDO.getOrderId(), businessOrderDO.getOrderNo(), userId, array);
                    if (StringUtils.isNoneBlank(response)) {
                        JSONObject jsonObject = JSONObject.parseObject(response);
                        if (jsonObject.getString("code").equalsIgnoreCase("10000")) {
                            String orderId = jsonObject.getString("orderId");
                            String orderNo = jsonObject.getString("orderNo");
                            businessOrderDO.setYkOrderId(orderId);
                            businessOrderDO.setYkOrderNo(orderNo);
                            businessOrderDO.setUploadStatus(1);
                            businessOrderDao.save(businessOrderDO);
                        }
                    }
                }
            }
        }
        return businessOrderDOS;
    }
@@ -245,6 +254,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            businessOrderDO.setPcCallbackUrl("https://intel.yanketong.com/ims-web/#/yk/consult/record?outpatientId="+businessOrderDO.getRelationCode()+"&verifyCode=");
        }
        List<WlyyHospitalSysDictDO> hospitalSysDictDOS = hospitalSysDictDao.findByDictName("WX_MONEY");
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("YKTCONTROL");
        String totalFee = null;
        if (hospitalSysDictDOS!=null&&hospitalSysDictDOS.size()!=0){
            totalFee= hospitalSysDictDOS.get(0).getDictValue();
@@ -258,7 +268,11 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        if (StringUtils.isNoneBlank(basePatientDO.getYktId())){
            patientId = basePatientDO.getYktId();
        }else {
            patientId = ykyyService.registerYkt(basePatientDO.getId());
            if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
            } else {
                patientId = ykyyService.registerYkt(basePatientDO.getId());
            }
        }
        String orderAmout = businessOrderDO.getPayPrice()/100+"";
        String description = businessOrderDO.getDescription();
@@ -271,25 +285,36 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        String pcCallBack=businessOrderDO.getPcCallbackUrl();
        String appCallBack = businessOrderDO.getAppCallbackUrl();
        String yktDoctor ="";
        if (doctorMappingDO!=null&&StringUtils.isNoneBlank(doctorMappingDO.getMappingCode())){
            String doctorResponse = ykyyService.getYktDoctor(doctorMappingDO.getMappingCode());
            JSONObject jsonObject = JSONObject.parseObject(doctorResponse);
            if (jsonObject.getInteger("code")==200){
                JSONArray array = jsonObject.getJSONArray("data");
                if (array!=null&&array.size()!=0){
                    yktDoctor=array.getJSONObject(0).getString("DOCTORUSERID");
            if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
            } else {
                String doctorResponse = ykyyService.getYktDoctor(doctorMappingDO.getMappingCode());
                System.out.println("Continue");
                JSONObject jsonObject = JSONObject.parseObject(doctorResponse);
                if (jsonObject.getInteger("code")==200){
                    JSONArray array = jsonObject.getJSONArray("data");
                    if (array!=null&&array.size()!=0){
                        yktDoctor=array.getJSONObject(0).getString("DOCTORUSERID");
                    }
                }
            }
        }else {
            /*throw new Exception("医生映射表不存在！");*/
            yktDoctor="hlwyymrys001";
        }
        String remark = businessOrderDO.getRematk();
        String response=ykyyService.addYktOrder(orderNo,patientId,orderAmout,remark,state,orderType,yktDoctor,payType,null,patientTel,orderCatagrate,pcCallBack,appCallBack);
        JSONObject object = JSONObject.parseObject(response);
        if (object.getInteger("code")==200){
            businessOrderDO.setUploadStatus(1);
            businessOrderDao.save(businessOrderDO);
        if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
        } else {
            String response=ykyyService.addYktOrder(orderNo,patientId,orderAmout,remark,state,orderType,yktDoctor,payType,null,patientTel,orderCatagrate,pcCallBack,appCallBack);
            JSONObject object = JSONObject.parseObject(response);
            if (object.getInteger("code")==200){
                businessOrderDO.setUploadStatus(1);
                businessOrderDao.save(businessOrderDO);
            }
        }
        return businessOrderDO;
    }
@@ -338,7 +363,13 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        if (doctorMappingDO!=null){
            doctorId = doctorMappingDO.getMappingCode();
        }
        ykyyService.addYktOrder(orderNo,patientId,orderAmout,description,state,orderType,doctorId,payType,null,patientTel,orderCatagrate,pcCallBack,appCallBack);
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("YKTCONTROL");
        if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
        } else {
            ykyyService.addYktOrder(orderNo,patientId,orderAmout,description,state,orderType,doctorId,payType,null,patientTel,orderCatagrate,pcCallBack,appCallBack);
        }
        return map;
    }
@@ -711,6 +742,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            //更改业务状态,做日志保存等操作
            BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(seqNo);
            businessOrderDO.setPayTime(DateUtil.strToDate(timeEnd,DateUtil.YYYY_MM_DD_HH_MM_SS));
            WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("YKTCONTROL");
            if (businessOrderDO!=null){
                if (businessOrderDO.getOrderCategory().equalsIgnoreCase("1")){
                    ConsultDo consultDo = consultOrderDao.findOne(businessOrderDO.getRelationCode());
@@ -773,20 +805,29 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                    }
                }else if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("5")){
                    String price = Integer.parseInt(totalFee)/100+"";
                    if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
                    if (businessOrderDO.getOrderType()==10){
                        String re = ykyyService.upRecharge4Jkzl(businessOrderDO.getYkOrderNo(), Integer.parseInt(price), 0);
                        logger.info("调用结果="+re);
                    }
                    if (businessOrderDO.getOrderType()==11){
                        String re = ykyyService.upRecharge4Jkzl(businessOrderDO.getYkOrderNo(), Integer.parseInt(price), 1);
                        logger.info("调用结果="+re);
                    } else {
                        if (businessOrderDO.getOrderType()==10){
                            String re = ykyyService.upRecharge4Jkzl(businessOrderDO.getYkOrderNo(), Integer.parseInt(price), 0);
                            logger.info("调用结果="+re);
                        }
                        if (businessOrderDO.getOrderType()==11){
                            String re = ykyyService.upRecharge4Jkzl(businessOrderDO.getYkOrderNo(), Integer.parseInt(price), 1);
                            logger.info("调用结果="+re);
                        }
                    }
                }
            }
            if (businessOrderDO!=null&&!businessOrderDO.getOrderCategory().equalsIgnoreCase("5")&&businessOrderDO.getStatus()!=1){
                ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),"1");
                if (null != hospitalSysDictDO && "0".equalsIgnoreCase(hospitalSysDictDO.getDictValue())) {
                } else {
                    ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),"1");
                }
            }
            businessOrderDO.setStatus(1);
            businessOrderDao.save(businessOrderDO);
@@ -1367,7 +1408,13 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        businessOrderDO.setPayType(5);
        businessOrderDao.save(businessOrderDO);
        String totalFee =(int)(businessOrderDO.getPayPrice()*100)+"";
        return ykyyService.getPayCDATA4Jkzl(businessOrderDO.getRematk(),businessOrderDO.getOrderNo(),totalFee,serverIp,notifyUrl);
        WlyyHospitalSysDictDO hospitalSysD2ictDO = hospitalSysDictDao.findById("YKTCONTROL");
        if (null != hospitalSysD2ictDO && "0".equalsIgnoreCase(hospitalSysD2ictDO.getDictValue())) {
            return null;
        } else {
            return ykyyService.getPayCDATA4Jkzl(businessOrderDO.getRematk(),businessOrderDO.getOrderNo(),totalFee,serverIp,notifyUrl);
        }
    }

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

@@ -2497,7 +2497,7 @@ public class ImService {
						content.deleteCharAt(content.length()-1);
					}
					map.put("icd10Name",content);
				}else if ("0".equals(type)&&null!=map.get("type")&&"17".equalsIgnoreCase(map.get("type").toString())){
				}else if ("0".equals(type)&&null!=map.get("type")&&("17".equalsIgnoreCase(map.get("type").toString())||"1".equalsIgnoreCase(map.get("type").toString()))){
					String consultCode = map.get("id").toString();
					List<WlyyConsultAdvice> consultAdvices = wlyyConsultAdviceDao.getByConsult(consultCode);
					StringBuffer content = new StringBuffer();

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/family/WlyyPatientFamilyMemberDO.java

@@ -38,6 +38,25 @@ public class WlyyPatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    private String cardType;
    private String cardNo;
    private String yktFamilyId;
    private String clinicid;
    public String getClinicid() {
        return clinicid;
    }
    public void setClinicid(String clinicid) {
        this.clinicid = clinicid;
    }
    public String getYktFamilyId() {
        return yktFamilyId;
    }
    public void setYktFamilyId(String yktFamilyId) {
        this.yktFamilyId = yktFamilyId;
    }
    public String getCardType() {
        return cardType;
    }

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -1510,7 +1510,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                    JSONObject jsonObject = JSONObject.parseObject(r);
                    if (null!=jsonObject.get("code")&&"200".equalsIgnoreCase(jsonObject.get("code").toString())){
                        JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("data").toString());
                        basePatientDO.setYktId(jsonObject1.getString("ID"));
                        basePatientDO.setUserId(jsonObject1.getString("ID"));
                    }else if (null!=jsonObject.get("code")&&"199".equalsIgnoreCase(jsonObject.get("code").toString())){
                        msg = jsonObject.getString("msg");
                        ykFlag = true;

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

@@ -78,7 +78,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
        String medicare = obj.getString("medicare");
        net.sf.json.JSONArray jsonArray = new JSONArray();
        if("xm_ykyy_wx".equalsIgnoreCase(wxId)){
            jsonArray = ykyyEntranceService.findHisPatientBymMedicare(medicare,false);
            jsonArray = ykyyEntranceService.findHisPatientBymMedicare(medicare,"",false);
            if(jsonArray!=null&&jsonArray.size()>0){
                net.sf.json.JSONObject jsonObject= net.sf.json.JSONObject.fromObject(jsonArray.get(0).toString());
                if (null!=jsonObject.get("brid")){
@@ -239,6 +239,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            String code = jsonObject.getString("code");
            String medicareType = jsonObject.getString("medicareType");
            String medicare = jsonObject.getString("medicare");
            String clinicId = jsonObject.getString("clinicId");
            boolean checkCode = this.verification(client_id, username, code);
            if (checkCode) {
                String patientId = jsonObject.getString("patientId");
@@ -261,7 +262,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                    id = jsonObject.get("id").toString();
                }
                ;
                mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false,medicareType,medicare);
                mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false,medicareType,medicare,clinicId);
            } else {
                mixEnvelop.setStatus(408);
                mixEnvelop.setMessage("验证码不正确");

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

@@ -19,6 +19,7 @@ import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.httplog.service.WlyyHttpLogService;
import com.yihu.jw.hospital.prescription.dao.*;
import com.yihu.jw.hospital.prescription.service.PayInfoNoticeService;
import com.yihu.jw.hospital.prescription.service.PrescriptionExpressageService;
@@ -59,6 +60,7 @@ import com.ylzinfo.onepay.sdk.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.vavr.control.Try;
import net.sf.json.JSONArray;
import org.apache.axis.utils.StringUtils;
import org.slf4j.Logger;
@@ -156,6 +158,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private YkyyEntranceService ykyyEntranceService;
    @Autowired
    private WlyyHttpLogService wlyyHttpLogService;
    @Autowired
    private EnterpriseService enterpriseService;
    private String successxml = "SUCCESS";
    private String failedxml = "FALSE";
@@ -1035,5 +1039,25 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                     @RequestParam(value = "orgCode", required = false) String orgCode) throws Exception {
        return qrcodeService.getWXGZHQrcode(orgCode);
    }
    @PostMapping(value = "/saveCheckHttpLog")
    @ApiOperation(value = "添加操作日志")
    public Envelop saveCheckHttpLog(@ApiParam(name = "code", value = "code")
                                      @RequestParam(value = "code", required = false) String code,
                                       @ApiParam(name = "name", value = "name")
                                       @RequestParam(value = "name", required = false) String name,
                                       @ApiParam(name = "patient", value = "patient")
                                           @RequestParam(value = "patient", required = false) String patient,
                                       @ApiParam(name = "doctor", value = "doctor")
                                           @RequestParam(value = "doctor", required = false) String doctor,
                                       @ApiParam(name = "request", value = "request")
                                           @RequestParam(value = "request", required = false) String request,
                                       @ApiParam(name = "respone", value = "respone")
                                           @RequestParam(value = "respone", required = false) String respone,
                                       @ApiParam(name = "status", value = "status")
                                           @RequestParam(value = "status", required = false) String status
                                       ) throws Exception {
        wlyyHttpLogService.saveHttpLog(code,name,patient,doctor,request,respone,status);
        return success("添加成功");
    }
}