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

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

@@ -217,8 +217,9 @@ public class HealthCareService {
            if (object.getString("flag").equalsIgnoreCase("1")){
                JSONObject encryptData = object.getJSONObject("encrypt_data");
                return encryptData.getString("is_prescribe");
            }else {
                return "0";
            }
            return result;
        }catch (Exception e){
            e.printStackTrace();
        }

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

@@ -335,8 +335,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    private String wechatId;
    @Value("${wechat.flag}")
    private boolean flag;
    @Autowired
    private  HealthCareService healthCareService;
    /**
     * 获取居民就诊记录接口
@@ -3833,7 +3832,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return rs.size();
    }
    @Transactional(readOnly = true)
    public Map<String, Object> findDoctorInfo(String doctor, String withWork,String patient) {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        Map<String, Object> rs = new HashedMap();