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

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

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -105,27 +105,27 @@ public class HealthCareService {
    public void initConfig() throws Exception{
        logger.info("初始话参数！");
        List<WlyyHospitalSysDictDO> hospitalSysDictDOS = hospitalSysDictDao.findByDictName("ylzConfig");
        List<WlyyHospitalSysDictDO> hospitalSysDictDOS = hospitalSysDictDao.findByDictName("ylzConfigTest");
        if (hospitalSysDictDOS==null||hospitalSysDictDOS.size()==0){
            throw new Exception("尚未添加配置参数");
        }else {
            for (WlyyHospitalSysDictDO hospitalSysDictDO:hospitalSysDictDOS){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigUrl")){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigUrlTest")){
                    ylzConfigUrl = hospitalSysDictDO.getDictValue();
                }
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigAppid")){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigAppidTest")){
                    ylzConfigAppid = hospitalSysDictDO.getDictValue();
                }
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigAppSecret")){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigAppSecretTest")){
                    ylzConfigAppSecret = hospitalSysDictDO.getDictValue();
                }
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigEncryptKey")){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigEncryptKeyTest")){
                    ylzConfigEncryptKey = hospitalSysDictDO.getDictValue();
                }
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigSignKey")){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigSignKeyTest")){
                    ylzConfigSignKey = hospitalSysDictDO.getDictValue();
                }
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigOrgCode")){
                if (hospitalSysDictDO.getId().equalsIgnoreCase("ylzConfigOrgCodeTest")){
                    ylzConfigOrgCode = hospitalSysDictDO.getDictValue();
                }
            }

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

@@ -403,28 +403,32 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
            throw new Exception("用户不存在");
        }
        Boolean flag = healthCareService.isHospitalFlag();
        if (flag){
            if(wxId.equalsIgnoreCase("xm_xzzx_wx")){
                String result = healthCareService.authorizedToEntrace(basePatientDO.getId());
                JSONObject object = JSONObject.parseObject(result);
                if (object.getString("flag").equalsIgnoreCase("1")){
                    JSONObject encryptData = object.getJSONObject("encrypt_data");
                    String state = encryptData.getString("state");
                    String auth_date = encryptData.getString("auth_date");
                    basePatientDO.setMedicalState(state);
                    basePatientDO = basePatientDao.save(basePatientDO);
                }
            }else {
                String result = healthCareService.authorized(basePatientDO.getId());
                JSONObject object = JSONObject.parseObject(result);
                if (object.getString("flag").equalsIgnoreCase("1")){
                    JSONObject encryptData = object.getJSONObject("encrypt_data");
                    String state = encryptData.getString("state");
                    String auth_date = encryptData.getString("auth_date");
                    basePatientDO.setMedicalState(state);
                    basePatientDO = basePatientDao.save(basePatientDO);
        try{
            if (flag){
                if(wxId.equalsIgnoreCase("xm_xzzx_wx")){
                    String result = healthCareService.authorizedToEntrace(basePatientDO.getId());
                    JSONObject object = JSONObject.parseObject(result);
                    if (object.getString("flag").equalsIgnoreCase("1")){
                        JSONObject encryptData = object.getJSONObject("encrypt_data");
                        String state = encryptData.getString("state");
                        String auth_date = encryptData.getString("auth_date");
                        basePatientDO.setMedicalState(state);
                        basePatientDO = basePatientDao.save(basePatientDO);
                    }
                }else {
                    String result = healthCareService.authorized(basePatientDO.getId());
                    JSONObject object = JSONObject.parseObject(result);
                    if (object.getString("flag").equalsIgnoreCase("1")){
                        JSONObject encryptData = object.getJSONObject("encrypt_data");
                        String state = encryptData.getString("state");
                        String auth_date = encryptData.getString("auth_date");
                        basePatientDO.setMedicalState(state);
                        basePatientDO = basePatientDao.save(basePatientDO);
                    }
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return basePatientDO;
    }

gateway/ag-basic/src/main/resources/application.yml

@@ -96,6 +96,9 @@ zuul:
    svr-internet-hospital:
      path: /hospital/**
      serviceId: svr-internet-hospital
    svr-internet-hospital-test:
      path: /hospitalTest/**
      serviceId: svr-internet-hospital-test
    svr-internet-hospital-entrance:
      path: /hospitalEntrance/**
      serviceId: svr-internet-hospital-entrance

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

@@ -236,11 +236,9 @@ public class MqSdkController extends EnvelopRestEndpoint {
    @ApiOperation(value = "Icd10诊断编码")
    public ListEnvelop MS25001( @ApiParam(name = "pyCode", value = "拼音码")
                           @RequestParam(value = "pyCode", required = false) String pyCode,
                                @ApiParam(name = "name", value = "诊断名称")
                                @RequestParam(value = "name", required = false) String name,
                                @ApiParam(name = "flag", value = "1为旧的ICD10 3为ICD9 4为2012-8月份ICD10")
                                @RequestParam(value = "flag", required = false) String flag)throws Exception {
        JSONArray obj = entranceService.MS25001(pyCode,name,demoFlag);
        JSONArray obj = entranceService.MS25001(pyCode,demoFlag);
        return success(obj);
    }

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

@@ -1001,6 +1001,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        String id = "";
        if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
            id = "zsyy";
        }else {
            id=wxId;
        }
        WxEnterpriseDO wxEnterpriseDO = wxEnterpriseDao.findOne(id);
        Map<Object, Object> map = new HashMap<Object, Object>();
@@ -1049,7 +1051,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "setXcxQrCode")
    @ApiOperation(value = "生成医生小程序二维码")
    public Envelop setXcxQrCode(@ApiParam(name = "doctor", value = "doctor", required = false)
                             @RequestParam(value = "doctor", required = true)String doctor) throws Exception{
                             @RequestParam(value = "doctor", required = false)String doctor) throws Exception{
        try {
            String uri = qrcodeService.makeSpecialistXcxQrcode(doctor);

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

@@ -1112,7 +1112,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "setXcxQrCode")
    @ApiOperation(value = "生成医生小程序二维码")
    public Envelop setXcxQrCode(@ApiParam(name = "doctor", value = "doctor", required = false)
                                @RequestParam(value = "doctor", required = true)String doctor) throws Exception{
                                @RequestParam(value = "doctor", required = false)String doctor) throws Exception{
        try {
            String uri = qrcodeService.makeSpecialistXcxQrcode(doctor);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java

@@ -185,6 +185,7 @@ public class QrcodeService {
        String token = wxAccessTokenService.getWxAppletsAccessTokenById(wxId).getAccessToken();
        System.out.println("token"+token);
        System.out.println("wxId"+wxId);
        String uriRes = "";
        if (StringUtils.isNoneBlank(doctor)){
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
            if (null!=baseDoctorDO){
@@ -224,16 +225,16 @@ public class QrcodeService {
                        System.out.println("uri"+uri);
                        doctorDO.setAppletQrCode(uri);
                        baseDoctorDao.save(doctorDO);
                        return uri;
                        uriRes= uri;
                    }else {
                        return doctorDO.getAppletQrCode();
                        uriRes= doctorDO.getAppletQrCode();
                    }
                } else {
                    throw new Exception("找不到对应医生信息!");
                }
            }
        }
        return null;
        return uriRes;
    }